diff options
author | Len Brown <len.brown@intel.com> | 2006-06-30 20:07:01 -0400 |
---|---|---|
committer | Len Brown <len.brown@intel.com> | 2006-06-30 20:07:01 -0400 |
commit | ba290ab7dace8b3339c0cc86c221d48eed21e956 (patch) | |
tree | b2e5d1e96b2799cd13010b140ffabd43e8f04963 /drivers/acpi/acpi_memhotplug.c | |
parent | 9262e9149f346a5443300f8c451b8e7631e81a42 (diff) | |
parent | 02438d8771ae6a4b215938959827692026380bf9 (diff) |
Pull kmalloc 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 cd57372a672..84a68965c11 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) info = buffer.pointer; if (!(info->valid & ACPI_VALID_HID)) { - acpi_os_free(buffer.pointer); + kfree(buffer.pointer); return AE_ERROR; } @@ -475,7 +475,7 @@ static acpi_status is_memory_device(acpi_handle handle) (strcmp(hardware_id, ACPI_MEMORY_DEVICE_HID))) status = AE_ERROR; - acpi_os_free(buffer.pointer); + kfree(buffer.pointer); return status; } |