aboutsummaryrefslogtreecommitdiffstats
path: root/arch
diff options
context:
space:
mode:
Diffstat (limited to 'arch')
-rw-r--r--arch/powerpc/kernel/pci_32.c5
-rw-r--r--arch/powerpc/kernel/pci_64.c2
2 files changed, 5 insertions, 2 deletions
diff --git a/arch/powerpc/kernel/pci_32.c b/arch/powerpc/kernel/pci_32.c
index d32cd500d8b8..0ad101a5fc5e 100644
--- a/arch/powerpc/kernel/pci_32.c
+++ b/arch/powerpc/kernel/pci_32.c
@@ -1269,7 +1269,10 @@ pcibios_init(void)
1269 if (pci_assign_all_buses) 1269 if (pci_assign_all_buses)
1270 hose->first_busno = next_busno; 1270 hose->first_busno = next_busno;
1271 hose->last_busno = 0xff; 1271 hose->last_busno = 0xff;
1272 bus = pci_scan_bus(hose->first_busno, hose->ops, hose); 1272 bus = pci_scan_bus_parented(hose->parent, hose->first_busno,
1273 hose->ops, hose);
1274 if (bus)
1275 pci_bus_add_devices(bus);
1273 hose->last_busno = bus->subordinate; 1276 hose->last_busno = bus->subordinate;
1274 if (pci_assign_all_buses || next_busno <= hose->last_busno) 1277 if (pci_assign_all_buses || next_busno <= hose->last_busno)
1275 next_busno = hose->last_busno + pcibios_assign_bus_offset; 1278 next_busno = hose->last_busno + pcibios_assign_bus_offset;
diff --git a/arch/powerpc/kernel/pci_64.c b/arch/powerpc/kernel/pci_64.c
index 5ffab8787b93..74e580d25c1b 100644
--- a/arch/powerpc/kernel/pci_64.c
+++ b/arch/powerpc/kernel/pci_64.c
@@ -513,7 +513,7 @@ void __devinit scan_phb(struct pci_controller *hose)
513 513
514 DBG("Scanning PHB %s\n", node ? node->full_name : "<NO NAME>"); 514 DBG("Scanning PHB %s\n", node ? node->full_name : "<NO NAME>");
515 515
516 bus = pci_create_bus(NULL, hose->first_busno, hose->ops, node); 516 bus = pci_create_bus(hose->parent, hose->first_busno, hose->ops, node);
517 if (bus == NULL) { 517 if (bus == NULL) {
518 printk(KERN_ERR "Failed to create bus for PCI domain %04x\n", 518 printk(KERN_ERR "Failed to create bus for PCI domain %04x\n",
519 hose->global_number); 519 hose->global_number);