From 98a913b759f043bc3a4429e2825f4c501bb12b58 Mon Sep 17 00:00:00 2001
From: Yinghai Lu <yinghai@kernel.org>
Date: Tue, 30 Oct 2012 14:31:43 -0600
Subject: [PATCH] --- yaml --- r: 343245 b: refs/heads/master c:
 9738a1fd214b8f617b31503307c79b6af72ee464 h: refs/heads/master i:   343243:
 a8c4e0a53caed90f6690cbeb3ea78486d4b80fe4 v: v3

---
 [refs]                        | 2 +-
 trunk/drivers/acpi/pci_root.c | 6 ++++++
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 06e10e11435f..d27c5fbf7b95 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: cdfcc572be0a8b423cecfb4ab5fd735fafe9c54a
+refs/heads/master: 9738a1fd214b8f617b31503307c79b6af72ee464
diff --git a/trunk/drivers/acpi/pci_root.c b/trunk/drivers/acpi/pci_root.c
index 27adbfdffb0c..aed09537861a 100644
--- a/trunk/drivers/acpi/pci_root.c
+++ b/trunk/drivers/acpi/pci_root.c
@@ -667,14 +667,20 @@ static int acpi_pci_root_remove(struct acpi_device *device, int type)
 	struct acpi_pci_root *root = acpi_driver_data(device);
 	struct acpi_pci_driver *driver;
 
+	pci_stop_root_bus(root->bus);
+
 	mutex_lock(&acpi_pci_root_lock);
 	list_for_each_entry(driver, &acpi_pci_drivers, node)
 		if (driver->remove)
 			driver->remove(root);
+	mutex_unlock(&acpi_pci_root_lock);
 
 	device_set_run_wake(root->bus->bridge, false);
 	pci_acpi_remove_bus_pm_notifier(device);
 
+	pci_remove_root_bus(root->bus);
+
+	mutex_lock(&acpi_pci_root_lock);
 	list_del(&root->node);
 	mutex_unlock(&acpi_pci_root_lock);
 	kfree(root);