diff options
| author | Alan Jenkins <alan-jenkins@tuffmail.co.uk> | 2009-08-28 14:56:37 +0200 |
|---|---|---|
| committer | Len Brown <len.brown@intel.com> | 2009-08-28 21:21:11 +0200 |
| commit | ffb03575284e0f72d7ea001178c793afa265b8b5 (patch) | |
| tree | 25bd46f8078ebf7cbc11792d227ab689e19da841 /drivers/platform | |
| parent | eeepc-laptop: make input device a child of the platform device (diff) | |
| download | linux-ffb03575284e0f72d7ea001178c793afa265b8b5.tar.xz linux-ffb03575284e0f72d7ea001178c793afa265b8b5.zip | |
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) 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(); } |