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: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Signed-off-by: Bjorn Helgaas <bhelgaas@google.com>

diff --git a/drivers/platform/x86/asus-wmi.c b/drivers/platform/x86/asus-wmi.c
index 19c313b056c334c771e678b05146ee7676e7edac..6fe268f6af91f806314773bc6f0b3d0a844af2ba 100644 (file)
--- a/drivers/platform/x86/asus-wmi.c
+++ b/drivers/platform/x86/asus-wmi.c
@@ -606,6 +606,7 @@ static void asus_rfkill_hotplug(struct asus_wmi *asus)
        mutex_unlock(&asus->wmi_lock);
 
        mutex_lock(&asus->hotplug_lock);
+       pci_lock_rescan_remove();
 
        if (asus->wlan.rfkill)
                rfkill_set_sw_state(asus->wlan.rfkill, blocked);
@@ -656,6 +657,7 @@ static void asus_rfkill_hotplug(struct asus_wmi *asus)
        }
 
 out_unlock:
+       pci_unlock_rescan_remove();
        mutex_unlock(&asus->hotplug_lock);
 }
 

diff --git a/drivers/platform/x86/eeepc-laptop.c b/drivers/platform/x86/eeepc-laptop.c
index aefcc32e563479d2b22404fdd75ceb7072423d16..538521b009488931227dacad13b7c68c32035543 100644 (file)
--- a/drivers/platform/x86/eeepc-laptop.c
+++ b/drivers/platform/x86/eeepc-laptop.c
@@ -592,6 +592,7 @@ static void eeepc_rfkill_hotplug(struct eeepc_laptop *eeepc, acpi_handle handle)
                rfkill_set_sw_state(eeepc->wlan_rfkill, blocked);
 
        mutex_lock(&eeepc->hotplug_lock);
+       pci_lock_rescan_remove();
 
        if (eeepc->hotplug_slot) {
                port = acpi_get_pci_dev(handle);
@@ -649,6 +650,7 @@ out_put_dev:
        }
 
 out_unlock:
+       pci_unlock_rescan_remove();
        mutex_unlock(&eeepc->hotplug_lock);
 }