diff options
| author | Len Brown <len.brown@intel.com> | 2006-07-01 23:19:08 +0200 |
|---|---|---|
| committer | Len Brown <len.brown@intel.com> | 2006-07-01 23:19:08 +0200 |
| commit | b197ba3c70638a3a2ae39296781912f26ac0f991 (patch) | |
| tree | 596f795437337d86edaa02d612120f4d5b3ce35d /drivers/acpi/acpi_memhotplug.c | |
| parent | Merge branch 'audit.b22' of git://git.kernel.org/pub/scm/linux/kernel/git/vir... (diff) | |
| parent | ACPI: delete acpi_os_free(), use kfree() directly (diff) | |
| download | linux-b197ba3c70638a3a2ae39296781912f26ac0f991.tar.xz linux-b197ba3c70638a3a2ae39296781912f26ac0f991.zip | |
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) 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; } |