OSDN Git Service
(root)
/
android-x86
/
kernel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
eaa5b8c
)
eeepc-laptop: remove redundant rfkill_set_sw_state in resume handler
author
Corentin Chary
<corentincj@iksaif.net>
Tue, 29 Sep 2009 14:05:16 +0000
(16:05 +0200)
committer
Corentin Chary
<corentincj@iksaif.net>
Wed, 30 Sep 2009 20:17:45 +0000
(22:17 +0200)
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>
drivers/platform/x86/eeepc-laptop.c
patch
|
blob
|
history
diff --git
a/drivers/platform/x86/eeepc-laptop.c
b/drivers/platform/x86/eeepc-laptop.c
index
f88b620
..
7f5dfb9
100644
(file)
--- a/
drivers/platform/x86/eeepc-laptop.c
+++ b/
drivers/platform/x86/eeepc-laptop.c
@@
-837,9
+837,7
@@
static int eeepc_hotk_resume(struct acpi_device *device)
wlan = get_acpi(CM_ASL_WLAN);
set_acpi(CM_ASL_WLAN, wlan);
- rfkill_force_state(ehotk->wlan_rfkill,
- wlan != 1);
-
+ /* Refresh both rfkill state and pci hotplug */
eeepc_rfkill_hotplug();
}