1 files changed, 7 insertions, 0 deletions

diff --git a/arch/alpha/kernel/pci.c b/arch/alpha/kernel/pci.c
index 98a1525fa164..82f738e5d54c 100644
--- a/arch/alpha/kernel/pci.c
+++ b/arch/alpha/kernel/pci.c
@@ -338,6 +338,8 @@ common_init_pci(void)
 
                 bus = pci_scan_root_bus(NULL, next_busno, alpha_mv.pci_ops,
                                         hose, &resources);
+                if (!bus)
+                        continue;
                 hose->bus = bus;
                 hose->need_domain_info = need_domain_info;
                 next_busno = bus->busn_res.end + 1;
@@ -353,6 +355,11 @@ common_init_pci(void)
 
         pci_assign_unassigned_resources();
         pci_fixup_irqs(alpha_mv.pci_swizzle, alpha_mv.pci_map_irq);
+        for (hose = hose_head; hose; hose = hose->next) {
+                bus = hose->bus;
+                if (bus)
+                        pci_bus_add_devices(bus);
+        }
 }