diff options
| author | jkim <jkim@FreeBSD.org> | 2013-05-20 23:52:49 +0000 |
|---|---|---|
| committer | jkim <jkim@FreeBSD.org> | 2013-05-20 23:52:49 +0000 |
| commit | ca7944e4059769f0f5788417db3d8f3b2a8e7996 (patch) | |
| tree | 3858a454e4df3ea62639923664ce32f0d9706e26 /sys/contrib/dev/acpica/components/tables/tbinstal.c | |
| parent | 4cdc15c1f748d4763888b9351c2316a878059a87 (diff) | |
| parent | af69f95bba3597db53a980597cfd371c9f6ee7cf (diff) | |
| download | FreeBSD-src-ca7944e4059769f0f5788417db3d8f3b2a8e7996.zip FreeBSD-src-ca7944e4059769f0f5788417db3d8f3b2a8e7996.tar.gz | |
Merge ACPICA 20130517.
Diffstat (limited to 'sys/contrib/dev/acpica/components/tables/tbinstal.c')
| -rw-r--r-- | sys/contrib/dev/acpica/components/tables/tbinstal.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/sys/contrib/dev/acpica/components/tables/tbinstal.c b/sys/contrib/dev/acpica/components/tables/tbinstal.c index e6558ff..6ca141f 100644 --- a/sys/contrib/dev/acpica/components/tables/tbinstal.c +++ b/sys/contrib/dev/acpica/components/tables/tbinstal.c @@ -160,7 +160,7 @@ AcpiTbAddTable ( ACPI_BIOS_ERROR ((AE_INFO, "Table has invalid signature [%4.4s] (0x%8.8X), " "must be SSDT or OEMx", - AcpiUtValidAcpiName (*(UINT32 *) TableDesc->Pointer->Signature) ? + AcpiUtValidAcpiName (TableDesc->Pointer->Signature) ? TableDesc->Pointer->Signature : "????", *(UINT32 *) TableDesc->Pointer->Signature)); @@ -514,16 +514,19 @@ AcpiTbDeleteTable ( switch (TableDesc->Flags & ACPI_TABLE_ORIGIN_MASK) { case ACPI_TABLE_ORIGIN_MAPPED: + AcpiOsUnmapMemory (TableDesc->Pointer, TableDesc->Length); break; case ACPI_TABLE_ORIGIN_ALLOCATED: + ACPI_FREE (TableDesc->Pointer); break; /* Not mapped or allocated, there is nothing we can do */ default: + return; } |
