Commit e1f8a19e authored Jun 11, 2009 by Johannes Berg Committed by John W. Linville Jun 15, 2009

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>

parent 9cbc1cb8

drivers/platform/x86/sony-laptop.c

+3 −2

Original line number	Diff line number	Diff line
		@@ -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;
		}