Browse Source

sony: fix rfkill code again

When the hard state changes, we shouldn't set the soft
state to blocked as well -- we have no such indication
from the device in that case so leave it untouched.

Fixes http://bugzilla.kernel.org/show_bug.cgi?id=13458.

Signed-off-by: Johannes Berg <johannes@sipsolutions.net>
Reported-by: Reinette Chatre <reinette.chatre@intel.com>
Tested-by: Reinette Chatre <reinette.chatre@intel.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
Johannes Berg 16 years ago
parent
commit
e1f8a19e6f
1 changed files with 3 additions and 2 deletions
  1. 3 2
      drivers/platform/x86/sony-laptop.c

+ 3 - 2
drivers/platform/x86/sony-laptop.c

@@ -1133,8 +1133,9 @@ static void sony_nc_rfkill_update()
 			continue;
 			continue;
 
 
 		if (hwblock) {
 		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;
 			continue;
 		}
 		}