Merge branch 'acpica' into release

1 files changed, 3 insertions, 5 deletions

diff --git a/drivers/acpi/dock.c b/drivers/acpi/dock.c
index 9a855669ff12..3a2cfefc71ab 100644
--- a/drivers/acpi/dock.c
+++ b/drivers/acpi/dock.c
@@ -233,18 +233,16 @@ static int is_ata(acpi_handle handle)
 static int is_battery(acpi_handle handle)
 {
         struct acpi_device_info *info;
-        struct acpi_buffer buffer = {ACPI_ALLOCATE_BUFFER, NULL};
         int ret = 1;
 
-        if (!ACPI_SUCCESS(acpi_get_object_info(handle, &buffer)))
+        if (!ACPI_SUCCESS(acpi_get_object_info(handle, &info)))
                 return 0;
-        info = buffer.pointer;
         if (!(info->valid & ACPI_VALID_HID))
                 ret = 0;
         else
-                ret = !strcmp("PNP0C0A", info->hardware_id.value);
+                ret = !strcmp("PNP0C0A", info->hardware_id.string);
 
-        kfree(buffer.pointer);
+        kfree(info);
         return ret;
 }