summaryrefslogtreecommitdiffstats
path: root/net/rfkill
diff options
context:
space:
mode:
authorSteve French <sfrench@us.ibm.com>2008-04-17 23:38:45 +0000
committerSteve French <sfrench@us.ibm.com>2008-04-17 23:38:45 +0000
commit20e673810c69d18bee2ed74d19af3806ec2504f5 (patch)
tree7c22dc5246295a82f2688a23ae1c7f3a4f424302 /net/rfkill
parent8d142137b4fe87188f211042b16a5993964226f9 (diff)
parent4b119e21d0c66c22e8ca03df05d9de623d0eb50f (diff)
downloadop-kernel-dev-20e673810c69d18bee2ed74d19af3806ec2504f5.zip
op-kernel-dev-20e673810c69d18bee2ed74d19af3806ec2504f5.tar.gz
Merge branch 'master' of /pub/scm/linux/kernel/git/torvalds/linux-2.6
Diffstat (limited to 'net/rfkill')
-rw-r--r--net/rfkill/rfkill.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/net/rfkill/rfkill.c b/net/rfkill/rfkill.c
index 140a0a8..4e10a95 100644
--- a/net/rfkill/rfkill.c
+++ b/net/rfkill/rfkill.c
@@ -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);
}
OpenPOWER on IntegriCloud