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/utils.c | |
| parent | 026477c1141b67e98e3bd8bdedb7d4b88a3ecd09 (diff) | |
| parent | ca78f6baca863afe2e6a244a0fe94b3a70211d46 (diff) | |
Merge branch 'master' of /home/trondmy/kernel/linux-2.6/
Diffstat (limited to 'drivers/acpi/utils.c')
| -rw-r--r-- | drivers/acpi/utils.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/acpi/utils.c b/drivers/acpi/utils.c index 1930e1a75b22..f48227f4c8c9 100644 --- a/drivers/acpi/utils.c +++ b/drivers/acpi/utils.c | |||
| @@ -332,7 +332,7 @@ acpi_evaluate_string(acpi_handle handle, | |||
| 332 | 332 | ||
| 333 | ACPI_DEBUG_PRINT((ACPI_DB_INFO, "Return value [%s]\n", *data)); | 333 | ACPI_DEBUG_PRINT((ACPI_DB_INFO, "Return value [%s]\n", *data)); |
| 334 | 334 | ||
| 335 | acpi_os_free(buffer.pointer); | 335 | kfree(buffer.pointer); |
| 336 | 336 | ||
| 337 | return AE_OK; | 337 | return AE_OK; |
| 338 | } | 338 | } |
| @@ -418,7 +418,7 @@ acpi_evaluate_reference(acpi_handle handle, | |||
| 418 | //kfree(list->handles); | 418 | //kfree(list->handles); |
| 419 | } | 419 | } |
| 420 | 420 | ||
| 421 | acpi_os_free(buffer.pointer); | 421 | kfree(buffer.pointer); |
| 422 | 422 | ||
| 423 | return status; | 423 | return status; |
| 424 | } | 424 | } |