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/battery.c | |
| parent | 9262e9149f346a5443300f8c451b8e7631e81a42 (diff) | |
| parent | 02438d8771ae6a4b215938959827692026380bf9 (diff) | |
Pull kmalloc into release branch
Diffstat (limited to 'drivers/acpi/battery.c')
| -rw-r--r-- | drivers/acpi/battery.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/acpi/battery.c b/drivers/acpi/battery.c index 00b0728efe82..7d92f73b265f 100644 --- a/drivers/acpi/battery.c +++ b/drivers/acpi/battery.c | |||
| @@ -171,7 +171,7 @@ acpi_battery_get_info(struct acpi_battery *battery, | |||
| 171 | } | 171 | } |
| 172 | 172 | ||
| 173 | end: | 173 | end: |
| 174 | acpi_os_free(buffer.pointer); | 174 | kfree(buffer.pointer); |
| 175 | 175 | ||
| 176 | if (!result) | 176 | if (!result) |
| 177 | (*bif) = (struct acpi_battery_info *)data.pointer; | 177 | (*bif) = (struct acpi_battery_info *)data.pointer; |
| @@ -231,7 +231,7 @@ acpi_battery_get_status(struct acpi_battery *battery, | |||
| 231 | } | 231 | } |
| 232 | 232 | ||
| 233 | end: | 233 | end: |
| 234 | acpi_os_free(buffer.pointer); | 234 | kfree(buffer.pointer); |
| 235 | 235 | ||
| 236 | if (!result) | 236 | if (!result) |
| 237 | (*bst) = (struct acpi_battery_status *)data.pointer; | 237 | (*bst) = (struct acpi_battery_status *)data.pointer; |