diff options
| author | Trond Myklebust <Trond.Myklebust@netapp.com> | 2006-07-05 13:13:03 -0400 |
|---|---|---|
| committer | Trond Myklebust <Trond.Myklebust@netapp.com> | 2006-07-05 13:13:03 -0400 |
| commit | 5e66dd6d66ffe758b39b6dcadf2330753ee1159b (patch) | |
| tree | a72cdcff4448e4af9425cc213ddf56ab23e697fe /drivers/acpi/scan.c | |
| parent | 026477c1141b67e98e3bd8bdedb7d4b88a3ecd09 (diff) | |
| parent | ca78f6baca863afe2e6a244a0fe94b3a70211d46 (diff) | |
Merge branch 'master' of /home/trondmy/kernel/linux-2.6/
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) |