From: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Date: Mon, 3 Feb 2014 01:22:27 +0000 (+0100)
Subject: ACPI / hotplug / PCI: Scan root bus under the PCI rescan-remove lock
X-Git-Url: http://drtracing.org/?a=commitdiff_plain;h=d42f5da2340083301dd2c48ff2d75f6ce4b30767;p=deliverable%2Flinux.git

ACPI / hotplug / PCI: Scan root bus under the PCI rescan-remove lock

Since acpiphp_check_bridge() called by acpiphp_check_host_bridge()
does things that require PCI rescan-remove locking around it,
make acpiphp_check_host_bridge() use that locking.

Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Tested-by: Mika Westerberg <mika.westerberg@linux.intel.com>
---

diff --git a/drivers/pci/hotplug/acpiphp_glue.c b/drivers/pci/hotplug/acpiphp_glue.c
index 6e5bd79af810..931d0b44eace 100644
--- a/drivers/pci/hotplug/acpiphp_glue.c
+++ b/drivers/pci/hotplug/acpiphp_glue.c
@@ -829,7 +829,11 @@ void acpiphp_check_host_bridge(acpi_handle handle)
 
 	bridge = acpiphp_handle_to_bridge(handle);
 	if (bridge) {
+		pci_lock_rescan_remove();
+
 		acpiphp_check_bridge(bridge);
+
+		pci_unlock_rescan_remove();
 		put_bridge(bridge);
 	}
 }