aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/acpi/acpica/tbinstal.c
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/acpi/acpica/tbinstal.c')
-rw-r--r--drivers/acpi/acpica/tbinstal.c7
1 files changed, 5 insertions, 2 deletions
diff --git a/drivers/acpi/acpica/tbinstal.c b/drivers/acpi/acpica/tbinstal.c
index e57cd38004e3..42a13c0d7015 100644
--- a/drivers/acpi/acpica/tbinstal.c
+++ b/drivers/acpi/acpica/tbinstal.c
@@ -141,8 +141,7 @@ acpi_tb_add_table(struct acpi_table_desc *table_desc, u32 *table_index)
141 ACPI_BIOS_ERROR((AE_INFO, 141 ACPI_BIOS_ERROR((AE_INFO,
142 "Table has invalid signature [%4.4s] (0x%8.8X), " 142 "Table has invalid signature [%4.4s] (0x%8.8X), "
143 "must be SSDT or OEMx", 143 "must be SSDT or OEMx",
144 acpi_ut_valid_acpi_name(*(u32 *)table_desc-> 144 acpi_ut_valid_acpi_name(table_desc->pointer->
145 pointer->
146 signature) ? 145 signature) ?
147 table_desc->pointer->signature : "????", 146 table_desc->pointer->signature : "????",
148 *(u32 *)table_desc->pointer->signature)); 147 *(u32 *)table_desc->pointer->signature));
@@ -471,15 +470,19 @@ void acpi_tb_delete_table(struct acpi_table_desc *table_desc)
471 } 470 }
472 switch (table_desc->flags & ACPI_TABLE_ORIGIN_MASK) { 471 switch (table_desc->flags & ACPI_TABLE_ORIGIN_MASK) {
473 case ACPI_TABLE_ORIGIN_MAPPED: 472 case ACPI_TABLE_ORIGIN_MAPPED:
473
474 acpi_os_unmap_memory(table_desc->pointer, table_desc->length); 474 acpi_os_unmap_memory(table_desc->pointer, table_desc->length);
475 break; 475 break;
476
476 case ACPI_TABLE_ORIGIN_ALLOCATED: 477 case ACPI_TABLE_ORIGIN_ALLOCATED:
478
477 ACPI_FREE(table_desc->pointer); 479 ACPI_FREE(table_desc->pointer);
478 break; 480 break;
479 481
480 /* Not mapped or allocated, there is nothing we can do */ 482 /* Not mapped or allocated, there is nothing we can do */
481 483
482 default: 484 default:
485
483 return; 486 return;
484 } 487 }
485 488