aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRafael J. Wysocki <rafael.j.wysocki@intel.com>2014-02-02 20:22:27 -0500
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>2014-02-03 16:28:26 -0500
commitd42f5da2340083301dd2c48ff2d75f6ce4b30767 (patch)
tree5b0552698709842d04c8cd72e292514a65d9bce2
parentf41b32613138ae05329a0f0e7170223b775d6b24 (diff)
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>
-rw-r--r--drivers/pci/hotplug/acpiphp_glue.c4
1 files changed, 4 insertions, 0 deletions
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)
829 829
830 bridge = acpiphp_handle_to_bridge(handle); 830 bridge = acpiphp_handle_to_bridge(handle);
831 if (bridge) { 831 if (bridge) {
832 pci_lock_rescan_remove();
833
832 acpiphp_check_bridge(bridge); 834 acpiphp_check_bridge(bridge);
835
836 pci_unlock_rescan_remove();
833 put_bridge(bridge); 837 put_bridge(bridge);
834 } 838 }
835} 839}