aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/pci/probe.c
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/pci/probe.c')
-rw-r--r--drivers/pci/probe.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/pci/probe.c b/drivers/pci/probe.c
index 3112024bdc2a..5db6b6690b59 100644
--- a/drivers/pci/probe.c
+++ b/drivers/pci/probe.c
@@ -543,7 +543,7 @@ int pci_scan_bridge(struct pci_bus *bus, struct pci_dev * dev, int max, int pass
543 goto out; 543 goto out;
544 child->primary = buses & 0xFF; 544 child->primary = buses & 0xFF;
545 child->subordinate = (buses >> 16) & 0xFF; 545 child->subordinate = (buses >> 16) & 0xFF;
546 child->bridge_ctl = bctl ^ PCI_BRIDGE_CTL_NO_ISA; 546 child->bridge_ctl = bctl;
547 547
548 cmax = pci_scan_child_bus(child); 548 cmax = pci_scan_child_bus(child);
549 if (cmax > max) 549 if (cmax > max)
@@ -596,7 +596,7 @@ int pci_scan_bridge(struct pci_bus *bus, struct pci_dev * dev, int max, int pass
596 pci_write_config_dword(dev, PCI_PRIMARY_BUS, buses); 596 pci_write_config_dword(dev, PCI_PRIMARY_BUS, buses);
597 597
598 if (!is_cardbus) { 598 if (!is_cardbus) {
599 child->bridge_ctl = bctl ^ PCI_BRIDGE_CTL_NO_ISA; 599 child->bridge_ctl = bctl;
600 /* 600 /*
601 * Adjust subordinate busnr in parent buses. 601 * Adjust subordinate busnr in parent buses.
602 * We do this before scanning for children because 602 * We do this before scanning for children because