From: Alan Jenkins Date: Fri, 28 Aug 2009 12:56:37 +0000 (+0000) Subject: eeepc-laptop: remove redundant rfkill_set_sw_state in resume handler X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=ffb03575284e0f72d7ea001178c793afa265b8b5;p=linux-beck.git 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 Signed-off-by: Corentin Chary Signed-off-by: Len Brown --- 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) wlan = get_acpi(CM_ASL_WLAN); set_acpi(CM_ASL_WLAN, wlan); - rfkill_set_sw_state(ehotk->wlan_rfkill, wlan != 1); - + /* Refresh both rfkill state and pci hotplug */ eeepc_rfkill_hotplug(); }