From: Johannes Berg <johannes@sipsolutions.net>
Date: Sun, 7 Jun 2009 19:57:08 +0000 (+0200)
Subject: sony: fix rfkill code
X-Git-Tag: v2.6.31-rc1~330^2~64^2~14
X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=fc240e3fc5791c572402b0857948da7b1e68d77f;p=~shefty%2Frdma-dev.git

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>
---

diff --git a/drivers/platform/x86/sony-laptop.c b/drivers/platform/x86/sony-laptop.c
index aec0b27fd77..f2893443b31 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;
 		}