diff options
author | Johannes Berg <johannes@sipsolutions.net> | 2009-06-07 15:57:08 -0400 |
---|---|---|
committer | John W. Linville <linville@tuxdriver.com> | 2009-06-10 13:27:55 -0400 |
commit | fc240e3fc5791c572402b0857948da7b1e68d77f (patch) | |
tree | 8b3feae524e121796021f618abeae5c4cd0d9e02 /drivers/platform | |
parent | b91d0e364077fad401454699143ad6a78902c20a (diff) |
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')
-rw-r--r-- | drivers/platform/x86/sony-laptop.c | 3 |
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() | |||
1135 | 1135 | ||
1136 | if (hwblock) { | 1136 | if (hwblock) { |
1137 | if (rfkill_set_hw_state(sony_rfkill_devices[i], true)) | 1137 | if (rfkill_set_hw_state(sony_rfkill_devices[i], true)) |
1138 | sony_nc_rfkill_set(sony_rfkill_devices[i], | 1138 | sony_nc_rfkill_set((void *)i, true); |
1139 | true); | ||
1140 | continue; | 1139 | continue; |
1141 | } | 1140 | } |
1142 | 1141 | ||