summaryrefslogtreecommitdiff
path: root/drivers/platform/x86/sony-laptop.c
diff options
context:
space:
mode:
authorJohannes Berg <johannes@sipsolutions.net>2009-06-07 23:57:08 +0400
committerJohn W. Linville <linville@tuxdriver.com>2009-06-10 21:27:55 +0400
commitfc240e3fc5791c572402b0857948da7b1e68d77f (patch)
tree8b3feae524e121796021f618abeae5c4cd0d9e02 /drivers/platform/x86/sony-laptop.c
parentb91d0e364077fad401454699143ad6a78902c20a (diff)
downloadlinux-fc240e3fc5791c572402b0857948da7b1e68d77f.tar.xz
sony: fix rfkill code
During the rfkill conversion I added code to call sony_nc_rfkill_set with the wrong argument, causing a segfault Reinette reported. The compiler could not catch that because the argument is, and needs to be, void *. Signed-off-by: Johannes Berg <johannes@sipsolutions.net> Reported-by: Reinette Chatre <reinette.chatre@intel.com> Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'drivers/platform/x86/sony-laptop.c')
-rw-r--r--drivers/platform/x86/sony-laptop.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/platform/x86/sony-laptop.c b/drivers/platform/x86/sony-laptop.c
index aec0b27fd774..f2893443b318 100644
--- a/drivers/platform/x86/sony-laptop.c
+++ b/drivers/platform/x86/sony-laptop.c
@@ -1135,8 +1135,7 @@ static void sony_nc_rfkill_update()
if (hwblock) {
if (rfkill_set_hw_state(sony_rfkill_devices[i], true))
- sony_nc_rfkill_set(sony_rfkill_devices[i],
- true);
+ sony_nc_rfkill_set((void *)i, true);
continue;
}