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/scan.c | |
| parent | fc25465f09414538afdbceacc517dd4dbabadeca (diff) | |
| parent | 02438d8771ae6a4b215938959827692026380bf9 (diff) | |
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) | |||
| 319 | goto end; | 319 | goto end; |
| 320 | } | 320 | } |
| 321 | 321 | ||
| 322 | acpi_os_free(buffer.pointer); | 322 | kfree(buffer.pointer); |
| 323 | 323 | ||
| 324 | device->wakeup.flags.valid = 1; | 324 | device->wakeup.flags.valid = 1; |
| 325 | /* Power button, Lid switch always enable wakeup */ | 325 | /* Power button, Lid switch always enable wakeup */ |
| @@ -854,7 +854,7 @@ static void acpi_device_set_id(struct acpi_device *device, | |||
| 854 | printk(KERN_ERR "Memory allocation error\n"); | 854 | printk(KERN_ERR "Memory allocation error\n"); |
| 855 | } | 855 | } |
| 856 | 856 | ||
| 857 | acpi_os_free(buffer.pointer); | 857 | kfree(buffer.pointer); |
| 858 | } | 858 | } |
| 859 | 859 | ||
| 860 | static int acpi_device_set_context(struct acpi_device *device, int type) | 860 | static int acpi_device_set_context(struct acpi_device *device, int type) |