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/scan.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/scan.c')
| -rw-r--r-- | drivers/acpi/scan.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/acpi/scan.c b/drivers/acpi/scan.c index 861ac378ce42..5fcb50c7b778 100644 --- a/drivers/acpi/scan.c +++ b/drivers/acpi/scan.c @@ -319,7 +319,7 @@ static int acpi_bus_get_wakeup_device_flags(struct acpi_device *device) goto end; } - acpi_os_free(buffer.pointer); + kfree(buffer.pointer); device->wakeup.flags.valid = 1; /* Power button, Lid switch always enable wakeup */ @@ -854,7 +854,7 @@ static void acpi_device_set_id(struct acpi_device *device, printk(KERN_ERR "Memory allocation error\n"); } - acpi_os_free(buffer.pointer); + kfree(buffer.pointer); } static int acpi_device_set_context(struct acpi_device *device, int type) |