aboutsummaryrefslogtreecommitdiff
path: root/drivers/platform/x86/sony-laptop.c
diff options
context:
space:
mode:
authorDavid S. Miller <davem@davemloft.net>2009-06-16 02:27:12 -0700
committerDavid S. Miller <davem@davemloft.net>2009-06-16 02:27:12 -0700
commita1870b9cc280fe16fed13994810f8a1687be3bcf (patch)
treed482018f5cc8ff0412c0c4d02f984960a5ec2385 /drivers/platform/x86/sony-laptop.c
parent6cc90a5a6061428358d0f726a53fb44af5254111 (diff)
parent1fa6f4af9f55bc1b753af04276984429d6b5a613 (diff)
downloadlinux-2.6.34-ux500-a1870b9cc280fe16fed13994810f8a1687be3bcf.tar.gz
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next-2.6
Diffstat (limited to 'drivers/platform/x86/sony-laptop.c')
-rw-r--r--drivers/platform/x86/sony-laptop.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/drivers/platform/x86/sony-laptop.c b/drivers/platform/x86/sony-laptop.c
index e48d9a4506f..dafaa4a92df 100644
--- a/drivers/platform/x86/sony-laptop.c
+++ b/drivers/platform/x86/sony-laptop.c
@@ -1133,8 +1133,9 @@ static void sony_nc_rfkill_update()
continue;
if (hwblock) {
- if (rfkill_set_hw_state(sony_rfkill_devices[i], true))
- sony_nc_rfkill_set((void *)i, true);
+ if (rfkill_set_hw_state(sony_rfkill_devices[i], true)) {
+ /* we already know we're blocked */
+ }
continue;
}