diff options
Diffstat (limited to 'drivers/platform/x86')
-rw-r--r-- | drivers/platform/x86/asus-wmi.c | 2 | ||||
-rw-r--r-- | drivers/platform/x86/eeepc-laptop.c | 2 |
2 files changed, 4 insertions, 0 deletions
diff --git a/drivers/platform/x86/asus-wmi.c b/drivers/platform/x86/asus-wmi.c index 19c313b056c3..6fe268f6af91 100644 --- 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) | |||
606 | mutex_unlock(&asus->wmi_lock); | 606 | mutex_unlock(&asus->wmi_lock); |
607 | 607 | ||
608 | mutex_lock(&asus->hotplug_lock); | 608 | mutex_lock(&asus->hotplug_lock); |
609 | pci_lock_rescan_remove(); | ||
609 | 610 | ||
610 | if (asus->wlan.rfkill) | 611 | if (asus->wlan.rfkill) |
611 | rfkill_set_sw_state(asus->wlan.rfkill, blocked); | 612 | rfkill_set_sw_state(asus->wlan.rfkill, blocked); |
@@ -656,6 +657,7 @@ static void asus_rfkill_hotplug(struct asus_wmi *asus) | |||
656 | } | 657 | } |
657 | 658 | ||
658 | out_unlock: | 659 | out_unlock: |
660 | pci_unlock_rescan_remove(); | ||
659 | mutex_unlock(&asus->hotplug_lock); | 661 | mutex_unlock(&asus->hotplug_lock); |
660 | } | 662 | } |
661 | 663 | ||
diff --git a/drivers/platform/x86/eeepc-laptop.c b/drivers/platform/x86/eeepc-laptop.c index aefcc32e5634..538521b00948 100644 --- 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) | |||
592 | rfkill_set_sw_state(eeepc->wlan_rfkill, blocked); | 592 | rfkill_set_sw_state(eeepc->wlan_rfkill, blocked); |
593 | 593 | ||
594 | mutex_lock(&eeepc->hotplug_lock); | 594 | mutex_lock(&eeepc->hotplug_lock); |
595 | pci_lock_rescan_remove(); | ||
595 | 596 | ||
596 | if (eeepc->hotplug_slot) { | 597 | if (eeepc->hotplug_slot) { |
597 | port = acpi_get_pci_dev(handle); | 598 | port = acpi_get_pci_dev(handle); |
@@ -649,6 +650,7 @@ out_put_dev: | |||
649 | } | 650 | } |
650 | 651 | ||
651 | out_unlock: | 652 | out_unlock: |
653 | pci_unlock_rescan_remove(); | ||
652 | mutex_unlock(&eeepc->hotplug_lock); | 654 | mutex_unlock(&eeepc->hotplug_lock); |
653 | } | 655 | } |
654 | 656 | ||