diff options
| author | Johannes Berg <johannes@sipsolutions.net> | 2009-06-11 12:08:15 +0200 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2009-06-15 15:05:51 -0400 |
| commit | e1f8a19e6fc4f6d4267f6d3fe465553c3688f28e (patch) | |
| tree | 752f58a83ab3a2cbd8306676ae0c56cd3a9672cb /drivers/platform/x86 | |
| parent | 9cbc1cb8cd46ce1f7645b9de249b2ce8460129bb (diff) | |
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>
Diffstat (limited to 'drivers/platform/x86')
| -rw-r--r-- | drivers/platform/x86/sony-laptop.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/drivers/platform/x86/sony-laptop.c b/drivers/platform/x86/sony-laptop.c index e48d9a4506f..dafaa4a92df 100644 --- a/drivers/platform/x86/sony-laptop.c +++ b/drivers/platform/x86/sony-laptop.c @@ -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; } |