diff options
| author | Bjorn Helgaas <bhelgaas@google.com> | 2013-08-27 01:40:34 +0400 |
|---|---|---|
| committer | Bjorn Helgaas <bhelgaas@google.com> | 2013-08-27 01:40:34 +0400 |
| commit | 07f2daad094bc9e9770143cd2d619de24d84bb3e (patch) | |
| tree | 202f930177f85456a129cfb3f7b5abc9615d52a4 /drivers/pci/hotplug | |
| parent | 1193725f543c92a77c73769bc2fbe48c53275f53 (diff) | |
| parent | 5895af79158a55562753f7f05762f3bd766d32b9 (diff) | |
| download | linux-07f2daad094bc9e9770143cd2d619de24d84bb3e.tar.xz | |
Merge branch 'pci/yijing-mps-v8' into next
* pci/yijing-mps-v8:
PCI: Warn if unsafe MPS settings detected
PCI: Fix MPS peer-to-peer DMA comment syntax
PCI: Don't restrict MPS for slots below Root Ports
PCI: Simplify MPS test for Downstream Port
PCI: Remove unnecessary check for pcie_get_mps() failure
PCI: Simplify pcie_bus_configure_settings() interface
PCI: Drop "PCI-E" prefix from Max Payload Size message
Diffstat (limited to 'drivers/pci/hotplug')
| -rw-r--r-- | drivers/pci/hotplug/pcihp_slot.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/drivers/pci/hotplug/pcihp_slot.c b/drivers/pci/hotplug/pcihp_slot.c index fec2d5b75440..16f920352317 100644 --- a/drivers/pci/hotplug/pcihp_slot.c +++ b/drivers/pci/hotplug/pcihp_slot.c @@ -160,9 +160,8 @@ void pci_configure_slot(struct pci_dev *dev) (dev->class >> 8) == PCI_CLASS_BRIDGE_PCI))) return; - if (dev->bus && dev->bus->self) - pcie_bus_configure_settings(dev->bus, - dev->bus->self->pcie_mpss); + if (dev->bus) + pcie_bus_configure_settings(dev->bus); memset(&hpp, 0, sizeof(hpp)); ret = pci_get_hp_params(dev, &hpp); |