---

yaml --- r: 81157 b: refs/heads/master c: b1b166b h: refs/heads/master i: 81155: 1f064eb v: v3
git-mirror · Dec 21, 2007 · 9a6eb3b · 9a6eb3b
1 parent 76c7b2a
commit 9a6eb3b
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 0094f2cdcfb6f2132b2ea3b4e85e0f6899c8595b
+refs/heads/master: b1b166b7ea2ec15700a8ba5c6ec99c2f9ecad89e
diff --git a/trunk/arch/powerpc/kernel/pci_32.c b/trunk/arch/powerpc/kernel/pci_32.c
@@ -442,9 +442,10 @@ static int __init pcibios_init(void)
 		hose->last_busno = 0xff;
 		bus = pci_scan_bus_parented(hose->parent, hose->first_busno,
 					    hose->ops, hose);
-		if (bus)
+		if (bus) {
 			pci_bus_add_devices(bus);
-		hose->last_busno = bus->subordinate;
+			hose->last_busno = bus->subordinate;
+		}
 		if (pci_assign_all_buses || next_busno <= hose->last_busno)
 			next_busno = hose->last_busno + pcibios_assign_bus_offset;
 	}