Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

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

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

drivers/platform/x86/asus-wmi.c

+2 −0
Original line number Diff line number Diff line
@@ -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);

}

drivers/platform/x86/eeepc-laptop.c

+2 −0
Original line number Diff line number Diff line
@@ -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 @@ static void eeepc_rfkill_hotplug(struct eeepc_laptop *eeepc, acpi_handle handle) 
	}



out_unlock:

	pci_unlock_rescan_remove();

	mutex_unlock(&eeepc->hotplug_lock);

}