Merge branch 'pci/enumeration' into next

[karo-tx-linux.git] / drivers / pci / pci.c

diff --git a/drivers/pci/pci.c b/drivers/pci/pci.c
index c87d1edf02038fabc5709fab55eae457906b21db..f85774b3da1e6c567b111681130e975c1cdb4689 100644 (file)
--- a/drivers/pci/pci.c
+++ b/drivers/pci/pci.c
@@ -4934,6 +4934,8 @@ bool pci_device_is_present(struct pci_dev *pdev)
 {
        u32 v;
 
+       if (pci_dev_is_disconnected(pdev))
+               return false;
        return pci_bus_read_dev_vendor_id(pdev->bus, pdev->devfn, &v, 0);
 }
 EXPORT_SYMBOL_GPL(pci_device_is_present);