powerpc/pci: Don't configure PCIe settings when PCI_PROBE_ONLY is set

[karo-tx-linux.git] / arch / powerpc / kernel / pci-common.c

diff --git a/arch/powerpc/kernel/pci-common.c b/arch/powerpc/kernel/pci-common.c
index 1bd47f36b25f84f2442ca1d4ba7e10717d61eefa..677ecccbe10da3aea9d946447994911df42b5280 100644 (file)
--- a/arch/powerpc/kernel/pci-common.c
+++ b/arch/powerpc/kernel/pci-common.c
@@ -1732,7 +1732,7 @@ void __devinit pcibios_scan_phb(struct pci_controller *hose)
                hose->last_busno = bus->subordinate = pci_scan_child_bus(bus);
 
        /* Configure PCI Express settings */
-       if (bus) {
+       if (bus && !pci_has_flag(PCI_PROBE_ONLY)) {
                struct pci_bus *child;
                list_for_each_entry(child, &bus->children, node) {
                        struct pci_dev *self = child->self;