diff options
| author | iwasaki <iwasaki@FreeBSD.org> | 2002-07-30 19:35:32 +0000 |
|---|---|---|
| committer | iwasaki <iwasaki@FreeBSD.org> | 2002-07-30 19:35:32 +0000 |
| commit | b2baff05fb67090f8db119f0d0bb418e4d61c212 (patch) | |
| tree | d1f4cc7bb805f34f1eedacd80e590c7f8bfa4478 /sys/dev/acpica/Osd | |
| parent | b22b2c8b83b39d40736d7874ad9e889ed10051fd (diff) | |
| download | FreeBSD-src-b2baff05fb67090f8db119f0d0bb418e4d61c212.zip FreeBSD-src-b2baff05fb67090f8db119f0d0bb418e4d61c212.tar.gz | |
Resolve conflicts arising from the ACPI CA 20020725 import.
Diffstat (limited to 'sys/dev/acpica/Osd')
| -rw-r--r-- | sys/dev/acpica/Osd/OsdTable.c | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/sys/dev/acpica/Osd/OsdTable.c b/sys/dev/acpica/Osd/OsdTable.c index a70e73e..58c01cd 100644 --- a/sys/dev/acpica/Osd/OsdTable.c +++ b/sys/dev/acpica/Osd/OsdTable.c @@ -45,13 +45,18 @@ AcpiOsTableOverride ( { caddr_t acpi_dsdt, p; - if (NewTable == NULL) + if (ExistingTable == NULL || NewTable == NULL) { return(AE_BAD_PARAMETER); } (*NewTable) = NULL; + if (strncmp(ExistingTable->Signature, "DSDT", 4) != 0) + { + return(AE_OK); + } + if ((acpi_dsdt = preload_search_by_type("acpi_dsdt")) == NULL) { return(AE_OK); |
