Merge with /pub/scm/linux/kernel/git/torvalds/linux-2.6.git

1 files changed, 2 insertions, 0 deletions

diff --git a/drivers/acpi/utils.c b/drivers/acpi/utils.c
index 6458c47f7ac2..6b516852ac12 100644
--- a/drivers/acpi/utils.c
+++ b/drivers/acpi/utils.c
@@ -273,11 +273,13 @@ acpi_evaluate_integer(acpi_handle handle,
         status = acpi_evaluate_object(handle, pathname, arguments, &buffer);
         if (ACPI_FAILURE(status)) {
                 acpi_util_eval_error(handle, pathname, status);
+                kfree(element);
                 return_ACPI_STATUS(status);
         }
 
         if (element->type != ACPI_TYPE_INTEGER) {
                 acpi_util_eval_error(handle, pathname, AE_BAD_DATA);
+                kfree(element);
                 return_ACPI_STATUS(AE_BAD_DATA);
         }