diff options
| author | Bjorn Helgaas <bhelgaas@google.com> | 2017-04-28 18:33:55 +0300 |
|---|---|---|
| committer | Bjorn Helgaas <bhelgaas@google.com> | 2017-04-28 18:33:55 +0300 |
| commit | f503ee4cbef9c5459d9e176542e4d0e0ed3915f6 (patch) | |
| tree | 0d2c86dd676b14ff8b39b4ded4bb741e99b8e8a2 /drivers/pci/pci.c | |
| parent | d060c6fcef972e6a8d0898c55f1b7b6da89a6744 (diff) | |
| parent | 9b70ae4951746146838b474c3a90722666edf4c1 (diff) | |
| download | linux-f503ee4cbef9c5459d9e176542e4d0e0ed3915f6.tar.xz | |
Merge branch 'pci/enumeration' into next
* pci/enumeration:
PCI: Include PCI-to-PCIe bridges as "Downstream Ports"
PCI: Improve __pci_read_base() robustness
PCI: Short-circuit pci_device_is_present() for disconnected devices
PCI/MSI: Skip disabling disconnected devices
PCI: Don't attempt config access to disconnected devices
PCI: Add device disconnected state
PCI: Export PCI device config accessors
Diffstat (limited to 'drivers/pci/pci.c')
| -rw-r--r-- | drivers/pci/pci.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/pci/pci.c b/drivers/pci/pci.c index c87d1edf0203..f85774b3da1e 100644 --- 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); |