Merge branch 'mpc86xx'

[u-boot] / drivers / pci.c

diff --git a/drivers/pci.c b/drivers/pci.c
index c618f5b086e9d5aaf9cf5376398b2115cf6552f1..3c24b99c3767fc89d7ceff71d84021e63ea1ed1e 100644 (file)
--- a/drivers/pci.c
+++ b/drivers/pci.c
@@ -142,7 +142,7 @@ struct pci_controller *pci_bus_to_hose (int bus)
                if (bus >= hose->first_busno && bus <= hose->last_busno)
                        return hose;
 
-       debug ("pci_bus_to_hose() failed\n");
+       printf("pci_bus_to_hose() failed\n");
        return NULL;
 }
 
@@ -459,6 +459,7 @@ int pci_hose_scan_bus(struct pci_controller *hose, int bus)
                                              PCI_BUS(dev), PCI_DEV(dev), PCI_FUNC(dev));
                        if (cfg) {
                                cfg->config_device(hose, dev, cfg);
+                               sub_bus = max(sub_bus, hose->current_busno);
 #ifdef CONFIG_PCI_PNP
                        } else {
                                int n = pciauto_config_device(hose, dev);