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 40e571d3c392..59d6c3092812 100644
--- a/drivers/pci/probe.c
+++ b/drivers/pci/probe.c
@@ -544,7 +544,7 @@ int pci_scan_bridge(struct pci_bus *bus, struct pci_dev * dev, int max, int pass
544 goto out; 544 goto out;
545 child->primary = buses & 0xFF; 545 child->primary = buses & 0xFF;
546 child->subordinate = (buses >> 16) & 0xFF; 546 child->subordinate = (buses >> 16) & 0xFF;
547 child->bridge_ctl = bctl; 547 child->bridge_ctl = bctl ^ PCI_BRIDGE_CTL_NO_ISA;
548 548
549 cmax = pci_scan_child_bus(child); 549 cmax = pci_scan_child_bus(child);
550 if (cmax > max) 550 if (cmax > max)
@@ -597,7 +597,7 @@ int pci_scan_bridge(struct pci_bus *bus, struct pci_dev * dev, int max, int pass
597 pci_write_config_dword(dev, PCI_PRIMARY_BUS, buses); 597 pci_write_config_dword(dev, PCI_PRIMARY_BUS, buses);
598 598
599 if (!is_cardbus) { 599 if (!is_cardbus) {
600 child->bridge_ctl = bctl | PCI_BRIDGE_CTL_NO_ISA; 600 child->bridge_ctl = bctl ^ PCI_BRIDGE_CTL_NO_ISA;
601 /* 601 /*
602 * Adjust subordinate busnr in parent buses. 602 * Adjust subordinate busnr in parent buses.
603 * We do this before scanning for children because 603 * We do this before scanning for children because