Commit 8b9ec1da authored by Rafael J. Wysocki's avatar Rafael J. Wysocki Committed by Bjorn Helgaas

platform / x86: Use global PCI rescan-remove locking

Multiple race conditions are possible between the rfkill hotplug in the
asus-wmi and eeepc-laptop drivers and the generic PCI bus rescan and device
removal that can be triggered via sysfs.

To avoid those race conditions make asus-wmi and eeepc-laptop use global
PCI rescan-remove locking around the rfkill hotplug.
Signed-off-by: default avatarRafael J. Wysocki <rafael.j.wysocki@intel.com>
Signed-off-by: default avatarBjorn Helgaas <bhelgaas@google.com>
parent c4ec84c7
...@@ -606,6 +606,7 @@ static void asus_rfkill_hotplug(struct asus_wmi *asus) ...@@ -606,6 +606,7 @@ static void asus_rfkill_hotplug(struct asus_wmi *asus)
mutex_unlock(&asus->wmi_lock); mutex_unlock(&asus->wmi_lock);
mutex_lock(&asus->hotplug_lock); mutex_lock(&asus->hotplug_lock);
pci_lock_rescan_remove();
if (asus->wlan.rfkill) if (asus->wlan.rfkill)
rfkill_set_sw_state(asus->wlan.rfkill, blocked); rfkill_set_sw_state(asus->wlan.rfkill, blocked);
...@@ -656,6 +657,7 @@ static void asus_rfkill_hotplug(struct asus_wmi *asus) ...@@ -656,6 +657,7 @@ static void asus_rfkill_hotplug(struct asus_wmi *asus)
} }
out_unlock: out_unlock:
pci_unlock_rescan_remove();
mutex_unlock(&asus->hotplug_lock); mutex_unlock(&asus->hotplug_lock);
} }
......
...@@ -592,6 +592,7 @@ static void eeepc_rfkill_hotplug(struct eeepc_laptop *eeepc, acpi_handle handle) ...@@ -592,6 +592,7 @@ static void eeepc_rfkill_hotplug(struct eeepc_laptop *eeepc, acpi_handle handle)
rfkill_set_sw_state(eeepc->wlan_rfkill, blocked); rfkill_set_sw_state(eeepc->wlan_rfkill, blocked);
mutex_lock(&eeepc->hotplug_lock); mutex_lock(&eeepc->hotplug_lock);
pci_lock_rescan_remove();
if (eeepc->hotplug_slot) { if (eeepc->hotplug_slot) {
port = acpi_get_pci_dev(handle); port = acpi_get_pci_dev(handle);
...@@ -649,6 +650,7 @@ static void eeepc_rfkill_hotplug(struct eeepc_laptop *eeepc, acpi_handle handle) ...@@ -649,6 +650,7 @@ static void eeepc_rfkill_hotplug(struct eeepc_laptop *eeepc, acpi_handle handle)
} }
out_unlock: out_unlock:
pci_unlock_rescan_remove();
mutex_unlock(&eeepc->hotplug_lock); mutex_unlock(&eeepc->hotplug_lock);
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment