From 4ffb9486b688571daa06db78a60f1d0f764a6136 Mon Sep 17 00:00:00 2001
From: Yinghai Lu <yinghai@kernel.org>
Date: Tue, 30 Oct 2012 14:31:26 -0600
Subject: [PATCH] --- yaml --- r: 343242 b: refs/heads/master c:
 e164f658f209b85566732bd85c62009237be0909 h: refs/heads/master v: v3

---
 [refs]                        | 2 +-
 trunk/drivers/pci/probe.c     | 1 +
 trunk/drivers/pci/setup-bus.c | 2 --
 3 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index 400becfbbb2b..0d16258b0ab9 100644
--- 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
index 65f62e353719..59cf1ba34936 100644
--- 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
index 59e6c55c6d25..6d3591d57ea0 100644
--- 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);
 }