Merge branch 'for_anthony' of git://git.kernel.org/pub/scm/linux/kernel/git/mst/qemu

* 'for_anthony' of git://git.kernel.org/pub/scm/linux/kernel/git/mst/qemu:
  pci: fix pci_find_bus()
This commit is contained in:
Blue Swirl 2010-02-13 09:00:05 +02:00
commit c730256b33

View file

@ -1558,7 +1558,7 @@ PCIBus *pci_find_bus(PCIBus *bus, int bus_num)
/* try child bus */
QLIST_FOREACH(sec, &bus->child, sibling) {
if (!bus->parent_dev /* pci host bridge */
|| (pci_bus_num(sec) >= bus_num &&
|| (pci_bus_num(sec) <= bus_num &&
bus_num <= bus->parent_dev->config[PCI_SUBORDINATE_BUS]) ) {
ret = pci_find_bus(sec, bus_num);
if (ret) {