Commit 8a8cd91c authored by Matthew Wilcox's avatar Matthew Wilcox Committed by Greg Kroah-Hartman

[PATCH] PCI: arch/i386/pci/irq.c should use pci_find_bus

Use pci_find_bus rather than relying on the return value of pci_scan_bus.
parent fed2058e
...@@ -102,13 +102,12 @@ static void __init pirq_peer_trick(void) ...@@ -102,13 +102,12 @@ static void __init pirq_peer_trick(void)
#endif #endif
busmap[e->bus] = 1; busmap[e->bus] = 1;
} }
for(i=1; i<256; i++) for(i = 1; i < 256; i++) {
/* if (!busmap[i] || pci_find_bus(0, i))
* It might be a secondary bus, but in this case its parent is already continue;
* known (ascending bus order) and therefore pci_scan_bus returns immediately. if (pci_scan_bus(i, &pci_root_ops, NULL))
*/
if (busmap[i] && pci_scan_bus(i, &pci_root_ops, NULL))
printk(KERN_INFO "PCI: Discovered primary peer bus %02x [IRQ]\n", i); printk(KERN_INFO "PCI: Discovered primary peer bus %02x [IRQ]\n", i);
}
pcibios_last_bus = -1; pcibios_last_bus = -1;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment