rfkill: Fix device type check when toggling states
PATCH 1/1 rfkill: Fix device type check when toggling states
rfkill_switch_all() is supposed to only switch all the interfaces of a given type, but does not actually do this; instead, it just switches everything currently in the same state.
Add the necessary type check in.
(This fixes a bug I've been seeing while developing an rfkill laptop driver, with both bluetooth and wireless simultaneously changing state after only pressing either KEY_WLAN or KEY_BLUETOOTH).
---
net/rfkill/rfkill.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-)
net/rfkill/rfkill.c +1 -1
@@ -92,7 +92,7 @@ void rfkill_switch_all(enum rfkill_type type, enum rfkill_state state) rfkill_states[type] = state;list_for_each_entry (rfkill, &rfkill_list, node) { -if (!rfkill->user_claim) +if ((!rfkill->user_claim) && (rfkill->type == type))rfkill_toggle_radio (rfkill, state); }
Quoted 11 lines · Carlos Corbacho
rfkill_switch_all()is supposed to only switch all the interfaces of a given type, but does not actually do this; instead, it just switches everything currently in the same state.Add the necessary type check in.
(This fixes a bug I've been seeing while developing an rfkill laptop driver, with both bluetooth and wireless simultaneously changing state after only pressing either
KEY_WLANorKEY_BLUETOOTH).Signed-off-by Carlos Corbacho <[email protected]>
Good catch.
John, could you push this to 2.6.25 as well? Thanks.
Quoted 21 lines
---
net/rfkill/rfkill.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-)net/rfkill/rfkill.c +1
-1@@ -92,7 +92,7 @@ void rfkill_switch_all(enum rfkill_type type, enum rfkill_state state) rfkill_states[type] = state;list_for_each_entry (rfkill, &rfkill_list, node) { -if (!rfkill->user_claim) +if ((!rfkill->user_claim) && (rfkill->type == type))rfkill_toggle_radio (rfkill, state); }