Merge branch 'acpica' into release

1 files changed, 4 insertions, 7 deletions

diff --git a/drivers/acpi/container.c b/drivers/acpi/container.c
index 5f2c3c00a315..642bb305cb65 100644
--- a/drivers/acpi/container.c
+++ b/drivers/acpi/container.c
@@ -202,20 +202,17 @@ container_walk_namespace_cb(acpi_handle handle,
                             u32 lvl, void *context, void **rv)
 {
         char *hid = NULL;
-        struct acpi_buffer buffer = { ACPI_ALLOCATE_BUFFER, NULL };
         struct acpi_device_info *info;
         acpi_status status;
         int *action = context;
 
-
-        status = acpi_get_object_info(handle, &buffer);
-        if (ACPI_FAILURE(status) || !buffer.pointer) {
+        status = acpi_get_object_info(handle, &info);
+        if (ACPI_FAILURE(status)) {
                 return AE_OK;
         }
 
-        info = buffer.pointer;
         if (info->valid & ACPI_VALID_HID)
-                hid = info->hardware_id.value;
+                hid = info->hardware_id.string;
 
         if (hid == NULL) {
                 goto end;
@@ -242,7 +239,7 @@ container_walk_namespace_cb(acpi_handle handle,
         }
 
       end:
-        kfree(buffer.pointer);
+        kfree(info);
 
         return AE_OK;
 }