diff options
| author | Bjorn Helgaas <bhelgaas@google.com> | 2013-02-02 14:35:57 -0700 |
|---|---|---|
| committer | Bjorn Helgaas <bhelgaas@google.com> | 2013-02-02 14:35:57 -0700 |
| commit | f2dfcde4ccd101fa3ba8f6c27273a0e359ea9c9c (patch) | |
| tree | 2920a8164d5243bc4c6a5e0eb006f1256ccecf66 /drivers/pci/pcie | |
| parent | ecb87e6609d3a559eacf7a61f5b4e088a797d07c (diff) | |
| parent | 775c739e0b08fbffb791595a4708460fc978b5b6 (diff) | |
| download | blackbird-op-linux-f2dfcde4ccd101fa3ba8f6c27273a0e359ea9c9c.tar.gz blackbird-op-linux-f2dfcde4ccd101fa3ba8f6c27273a0e359ea9c9c.zip | |
Merge branch 'pci/misc' into next
* pci/misc:
PCI: pciehp: Drop suspend/resume ENTRY messages
PCI: Document MPS parameters pci=pcie_bus_safe, pci=pcie_bus_perf, etc
PCI: Document hpiosize= and hpmemsize= resource reservation parameters
PCI: Use PCI Express Capability accessor
PCI: Introduce accessor to retrieve PCIe Capabilities Register
PCI: Kill pci_is_reassigndev()
Diffstat (limited to 'drivers/pci/pcie')
| -rw-r--r-- | drivers/pci/pcie/portdrv_core.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/pci/pcie/portdrv_core.c b/drivers/pci/pcie/portdrv_core.c index b42133afca98..31063ac30992 100644 --- a/drivers/pci/pcie/portdrv_core.c +++ b/drivers/pci/pcie/portdrv_core.c @@ -272,7 +272,7 @@ static int get_port_device_capability(struct pci_dev *dev) /* Hot-Plug Capable */ if ((cap_mask & PCIE_PORT_SERVICE_HP) && - dev->pcie_flags_reg & PCI_EXP_FLAGS_SLOT) { + pcie_caps_reg(dev) & PCI_EXP_FLAGS_SLOT) { pcie_capability_read_dword(dev, PCI_EXP_SLTCAP, ®32); if (reg32 & PCI_EXP_SLTCAP_HPC) { services |= PCIE_PORT_SERVICE_HP; |
