---

yaml --- r: 343242 b: refs/heads/master c: e164f65 h: refs/heads/master v: v3
git-mirror · Nov 3, 2012 · 4ffb948 · 4ffb948
1 parent 48cfbe2
commit 4ffb948
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 3 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: a5213a3194f73cd29c68128d1540ce81f03ba7b9
+refs/heads/master: e164f658f209b85566732bd85c62009237be0909
diff --git a/trunk/drivers/pci/probe.c b/trunk/drivers/pci/probe.c
@@ -1905,6 +1905,7 @@ unsigned int __ref pci_rescan_bus(struct pci_bus *bus)
 
 	max = pci_scan_child_bus(bus);
 	pci_assign_unassigned_bus_resources(bus);
+	pci_enable_bridges(bus);
 	pci_bus_add_devices(bus);
 
 	return max;

diff --git a/trunk/drivers/pci/setup-bus.c b/trunk/drivers/pci/setup-bus.c
@@ -1566,6 +1566,4 @@ void pci_assign_unassigned_bus_resources(struct pci_bus *bus)
 	up_read(&pci_bus_sem);
 	__pci_bus_assign_resources(bus, &add_list, NULL);
 	BUG_ON(!list_empty(&add_list));
-
-	pci_enable_bridges(bus);
 }