diff options
author | Len Brown <len.brown@intel.com> | 2006-07-01 17:19:08 -0400 |
---|---|---|
committer | Len Brown <len.brown@intel.com> | 2006-07-01 17:19:08 -0400 |
commit | b197ba3c70638a3a2ae39296781912f26ac0f991 (patch) | |
tree | 596f795437337d86edaa02d612120f4d5b3ce35d /drivers/acpi/acpi_memhotplug.c | |
parent | fc25465f09414538afdbceacc517dd4dbabadeca (diff) | |
parent | 02438d8771ae6a4b215938959827692026380bf9 (diff) |
Pull acpi_os_free into release branch
Diffstat (limited to 'drivers/acpi/acpi_memhotplug.c')
-rw-r--r-- | drivers/acpi/acpi_memhotplug.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/acpi/acpi_memhotplug.c b/drivers/acpi/acpi_memhotplug.c index cd57372a6729..84a68965c11a 100644 --- a/drivers/acpi/acpi_memhotplug.c +++ b/drivers/acpi/acpi_memhotplug.c | |||
@@ -466,7 +466,7 @@ static acpi_status is_memory_device(acpi_handle handle) | |||
466 | 466 | ||
467 | info = buffer.pointer; | 467 | info = buffer.pointer; |
468 | if (!(info->valid & ACPI_VALID_HID)) { | 468 | if (!(info->valid & ACPI_VALID_HID)) { |
469 | acpi_os_free(buffer.pointer); | 469 | kfree(buffer.pointer); |
470 | return AE_ERROR; | 470 | return AE_ERROR; |
471 | } | 471 | } |
472 | 472 | ||
@@ -475,7 +475,7 @@ static acpi_status is_memory_device(acpi_handle handle) | |||
475 | (strcmp(hardware_id, ACPI_MEMORY_DEVICE_HID))) | 475 | (strcmp(hardware_id, ACPI_MEMORY_DEVICE_HID))) |
476 | status = AE_ERROR; | 476 | status = AE_ERROR; |
477 | 477 | ||
478 | acpi_os_free(buffer.pointer); | 478 | kfree(buffer.pointer); |
479 | return status; | 479 | return status; |
480 | } | 480 | } |
481 | 481 | ||