]> err.no Git - linux-2.6/commitdiff
rfkill: Fix device type check when toggling states
authorCarlos Corbacho <carlos@strangeworlds.co.uk>
Sat, 12 Apr 2008 15:39:47 +0000 (16:39 +0100)
committerJohn W. Linville <linville@tuxdriver.com>
Tue, 15 Apr 2008 19:04:35 +0000 (15:04 -0400)
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).

Signed-off-by: Carlos Corbacho <carlos@strangeworlds.co.uk>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
net/rfkill/rfkill.c

index 140a0a8c6b02fe5e5f4f4d0177a947aeb51d1692..4e10a95de8321acfd3ea3aa37885d1519f2a0ecf 100644 (file)
@@ -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);
        }