diff options
Diffstat (limited to 'drivers/acpi/tables/tbinstal.c')
-rw-r--r-- | drivers/acpi/tables/tbinstal.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/acpi/tables/tbinstal.c b/drivers/acpi/tables/tbinstal.c index ec2cb978b7c4..ce57a195577a 100644 --- a/drivers/acpi/tables/tbinstal.c +++ b/drivers/acpi/tables/tbinstal.c | |||
@@ -248,7 +248,7 @@ acpi_tb_init_table_descriptor(acpi_table_type table_type, | |||
248 | 248 | ||
249 | /* Allocate a descriptor for this table */ | 249 | /* Allocate a descriptor for this table */ |
250 | 250 | ||
251 | table_desc = ACPI_MEM_CALLOCATE(sizeof(struct acpi_table_desc)); | 251 | table_desc = ACPI_ALLOCATE_ZEROED(sizeof(struct acpi_table_desc)); |
252 | if (!table_desc) { | 252 | if (!table_desc) { |
253 | return_ACPI_STATUS(AE_NO_MEMORY); | 253 | return_ACPI_STATUS(AE_NO_MEMORY); |
254 | } | 254 | } |
@@ -275,7 +275,7 @@ acpi_tb_init_table_descriptor(acpi_table_type table_type, | |||
275 | * at this location, so return an error. | 275 | * at this location, so return an error. |
276 | */ | 276 | */ |
277 | if (list_head->next) { | 277 | if (list_head->next) { |
278 | ACPI_MEM_FREE(table_desc); | 278 | ACPI_FREE(table_desc); |
279 | return_ACPI_STATUS(AE_ALREADY_EXISTS); | 279 | return_ACPI_STATUS(AE_ALREADY_EXISTS); |
280 | } | 280 | } |
281 | 281 | ||
@@ -472,7 +472,7 @@ void acpi_tb_delete_single_table(struct acpi_table_desc *table_desc) | |||
472 | 472 | ||
473 | case ACPI_MEM_ALLOCATED: | 473 | case ACPI_MEM_ALLOCATED: |
474 | 474 | ||
475 | ACPI_MEM_FREE(table_desc->pointer); | 475 | ACPI_FREE(table_desc->pointer); |
476 | break; | 476 | break; |
477 | 477 | ||
478 | case ACPI_MEM_MAPPED: | 478 | case ACPI_MEM_MAPPED: |
@@ -531,7 +531,7 @@ struct acpi_table_desc *acpi_tb_uninstall_table(struct acpi_table_desc | |||
531 | /* Free the table descriptor */ | 531 | /* Free the table descriptor */ |
532 | 532 | ||
533 | next_desc = table_desc->next; | 533 | next_desc = table_desc->next; |
534 | ACPI_MEM_FREE(table_desc); | 534 | ACPI_FREE(table_desc); |
535 | 535 | ||
536 | /* Return pointer to the next descriptor */ | 536 | /* Return pointer to the next descriptor */ |
537 | 537 | ||