diff options
author | Alan Jenkins <alan-jenkins@tuffmail.co.uk> | 2009-08-28 08:56:37 -0400 |
---|---|---|
committer | Len Brown <len.brown@intel.com> | 2009-08-28 15:21:11 -0400 |
commit | ffb03575284e0f72d7ea001178c793afa265b8b5 (patch) | |
tree | 25bd46f8078ebf7cbc11792d227ab689e19da841 /drivers/platform | |
parent | f2a9d5e8a649c606f520b7a7b9f4f46fba79c327 (diff) |
eeepc-laptop: remove redundant rfkill_set_sw_state in resume handler
rfkill_set_sw_state() will already be called by eeepc_rfkill_hotplug().
Signed-off-by: Alan Jenkins <alan-jenkins@tuffmail.co.uk>
Signed-off-by: Corentin Chary <corentincj@iksaif.net>
Signed-off-by: Len Brown <len.brown@intel.com>
Diffstat (limited to 'drivers/platform')
-rw-r--r-- | drivers/platform/x86/eeepc-laptop.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/platform/x86/eeepc-laptop.c b/drivers/platform/x86/eeepc-laptop.c index 298dac9c6ada..7f7573a30ddc 100644 --- a/drivers/platform/x86/eeepc-laptop.c +++ b/drivers/platform/x86/eeepc-laptop.c | |||
@@ -835,8 +835,7 @@ static int eeepc_hotk_resume(struct acpi_device *device) | |||
835 | wlan = get_acpi(CM_ASL_WLAN); | 835 | wlan = get_acpi(CM_ASL_WLAN); |
836 | set_acpi(CM_ASL_WLAN, wlan); | 836 | set_acpi(CM_ASL_WLAN, wlan); |
837 | 837 | ||
838 | rfkill_set_sw_state(ehotk->wlan_rfkill, wlan != 1); | 838 | /* Refresh both rfkill state and pci hotplug */ |
839 | |||
840 | eeepc_rfkill_hotplug(); | 839 | eeepc_rfkill_hotplug(); |
841 | } | 840 | } |
842 | 841 | ||