asgardius/android_kernel_motorola_sm6225
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

xo1-rfkill: only act when blocked state is changed

Browse source 
The XO-1 rfkill driver should only send EC commands when changing
between blocked/unblocked state.

The rfkill switch is asked to be unblocked on every resume (even when
the card was never blocked before) and sending a EC_WLAN_LEAVE_RESET
command here upsets the resume sequence of the libertas driver. Adding
the check to avoid the spurious EC_WLAN_LEAVE_RESET fixes the wifi resume
behaviour.

The rfkill state is maintained by the hardware over suspend/resume
so no extra consideration is needed here.

Signed-off-by: Daniel Drake <dsd@laptop.org>
Signed-off-by: Matthew Garrett <mjg@redhat.com>
This commit is contained in:
Daniel Drake 2012-04-18 18:08:21 +01:00 committed by Matthew Garrett
parent 14b234b105
commit bc7ab495c7
1 changed files with 12 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
drivers/platform/x86/xo1-rfkill.c
View file

@ -15,15 +15,26 @@
#include <asm/olpc.h> #include <asm/olpc.h>
static bool card_blocked;
static int rfkill_set_block(void *data, bool blocked) static int rfkill_set_block(void *data, bool blocked)
{ {
unsigned char cmd; unsigned char cmd;
int r;
if (blocked == card_blocked)
return 0;
if (blocked) if (blocked)
cmd = EC_WLAN_ENTER_RESET; cmd = EC_WLAN_ENTER_RESET;
else else
cmd = EC_WLAN_LEAVE_RESET; cmd = EC_WLAN_LEAVE_RESET;
return olpc_ec_cmd(cmd, NULL, 0, NULL, 0); r = olpc_ec_cmd(cmd, NULL, 0, NULL, 0);
if (r == 0)
card_blocked = blocked;
return r;
} }
static const struct rfkill_ops rfkill_ops = { static const struct rfkill_ops rfkill_ops = {