diff options
| author | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2014-03-06 00:48:26 +0100 |
|---|---|---|
| committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2014-03-06 00:48:26 +0100 |
| commit | d901188f002104905a7845298e1a7dc94189007a (patch) | |
| tree | 14bf855f9bb377b67887d21892e0cacc259c6204 /drivers/pci | |
| parent | 1e3bcb596c6b1cf6db93f8f506e2de260e771bad (diff) | |
| parent | b8a62d540240387c7e97a69127cab3ab9cadc70a (diff) | |
Merge branch 'acpi-pci-hotplug' into acpi-hotplug
Diffstat (limited to 'drivers/pci')
| -rw-r--r-- | drivers/pci/hotplug/acpiphp_glue.c | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/drivers/pci/hotplug/acpiphp_glue.c b/drivers/pci/hotplug/acpiphp_glue.c index a92b8b01790..828acf422c1 100644 --- a/drivers/pci/hotplug/acpiphp_glue.c +++ b/drivers/pci/hotplug/acpiphp_glue.c @@ -668,12 +668,9 @@ static void trim_stale_devices(struct pci_dev *dev) alive = (ACPI_SUCCESS(status) && device_status_valid(sta)) || acpiphp_no_hotplug(adev); } - if (!alive) { - u32 v; + if (!alive) + alive = pci_device_is_present(dev); - /* Check if the device responds. */ - alive = pci_bus_read_dev_vendor_id(dev->bus, dev->devfn, &v, 0); - } if (!alive) { pci_stop_and_remove_bus_device(dev); if (adev) |