---

yaml --- r: 362872 b: refs/heads/master c: 981cf9e h: refs/heads/master v: v3
git-mirror · Apr 12, 2013 · 46df489 · 46df489
1 parent 3b27d6c
commit 46df489
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 12 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 1e89d268e7a83d8388d4d09d3f2089ced72cc15f
+refs/heads/master: 981cf9ea9a6a6c422e51fc04bedad00b7792ccbc
diff --git a/trunk/drivers/pci/bus.c b/trunk/drivers/pci/bus.c
@@ -206,16 +206,9 @@ void pci_bus_add_devices(const struct pci_bus *bus)
 
 	list_for_each_entry(dev, &bus->devices, bus_list) {
 		BUG_ON(!dev->is_added);
-
 		child = dev->subordinate;
-
-		if (!child)
-			continue;
-		pci_bus_add_devices(child);
-
-		if (child->is_added)
-			continue;
-		child->is_added = 1;
+		if (child)
+			pci_bus_add_devices(child);
 	}
 }
 

diff --git a/trunk/drivers/pci/probe.c b/trunk/drivers/pci/probe.c
@@ -1627,8 +1627,7 @@ unsigned int pci_scan_child_bus(struct pci_bus *bus)
 	if (!bus->is_added) {
 		dev_dbg(&bus->dev, "fixups for bus\n");
 		pcibios_fixup_bus(bus);
-		if (pci_is_root_bus(bus))
-			bus->is_added = 1;
+		bus->is_added = 1;
 	}
 
 	for (pass=0; pass < 2; pass++)