1 files changed, 5 insertions, 7 deletions

diff --git a/drivers/pci/hotplug/acpiphp_ibm.c b/drivers/pci/hotplug/acpiphp_ibm.c
index 5befa7e379b7..a9d926b7d805 100644
--- a/drivers/pci/hotplug/acpiphp_ibm.c
+++ b/drivers/pci/hotplug/acpiphp_ibm.c
@@ -398,23 +398,21 @@ static acpi_status __init ibm_find_acpi_device(acpi_handle handle,
         acpi_handle *phandle = (acpi_handle *)context;
         acpi_status status; 
         struct acpi_device_info *info;
-        struct acpi_buffer info_buffer = { ACPI_ALLOCATE_BUFFER, NULL };
         int retval = 0;
 
-        status = acpi_get_object_info(handle, &info_buffer);
+        status = acpi_get_object_info(handle, &info);
         if (ACPI_FAILURE(status)) {
                 err("%s:  Failed to get device information status=0x%x\n",
                         __func__, status);
                 return retval;
         }
-        info = info_buffer.pointer;
-        info->hardware_id.value[sizeof(info->hardware_id.value) - 1] = '\0';
+        info->hardware_id.string[sizeof(info->hardware_id.length) - 1] = '\0';
 
         if (info->current_status && (info->valid & ACPI_VALID_HID) &&
-                        (!strcmp(info->hardware_id.value, IBM_HARDWARE_ID1) ||
-                         !strcmp(info->hardware_id.value, IBM_HARDWARE_ID2))) {
+                        (!strcmp(info->hardware_id.string, IBM_HARDWARE_ID1) ||
+                         !strcmp(info->hardware_id.string, IBM_HARDWARE_ID2))) {
                 dbg("found hardware: %s, handle: %p\n",
-                        info->hardware_id.value, handle);
+                        info->hardware_id.string, handle);
                 *phandle = handle;
                 /* returning non-zero causes the search to stop
                  * and returns this value to the caller of