aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/pci
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/pci')
-rw-r--r--drivers/pci/hotplug/acpiphp_ibm.c5
1 files changed, 4 insertions, 1 deletions
diff --git a/drivers/pci/hotplug/acpiphp_ibm.c b/drivers/pci/hotplug/acpiphp_ibm.c
index 3903d90fe51c..41713f16ff97 100644
--- a/drivers/pci/hotplug/acpiphp_ibm.c
+++ b/drivers/pci/hotplug/acpiphp_ibm.c
@@ -385,6 +385,7 @@ static acpi_status __init ibm_find_acpi_device(acpi_handle handle,
385 u32 lvl, void *context, void **rv) 385 u32 lvl, void *context, void **rv)
386{ 386{
387 acpi_handle *phandle = (acpi_handle *)context; 387 acpi_handle *phandle = (acpi_handle *)context;
388 unsigned long long current_status = 0;
388 acpi_status status; 389 acpi_status status;
389 struct acpi_device_info *info; 390 struct acpi_device_info *info;
390 int retval = 0; 391 int retval = 0;
@@ -396,7 +397,9 @@ static acpi_status __init ibm_find_acpi_device(acpi_handle handle,
396 return retval; 397 return retval;
397 } 398 }
398 399
399 if (info->current_status && (info->valid & ACPI_VALID_HID) && 400 acpi_bus_get_status_handle(handle, &current_status);
401
402 if (current_status && (info->valid & ACPI_VALID_HID) &&
400 (!strcmp(info->hardware_id.string, IBM_HARDWARE_ID1) || 403 (!strcmp(info->hardware_id.string, IBM_HARDWARE_ID1) ||
401 !strcmp(info->hardware_id.string, IBM_HARDWARE_ID2))) { 404 !strcmp(info->hardware_id.string, IBM_HARDWARE_ID2))) {
402 pr_debug("found hardware: %s, handle: %p\n", 405 pr_debug("found hardware: %s, handle: %p\n",