diff options
author | David S. Miller <davem@davemloft.net> | 2010-04-07 16:41:03 -0700 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2010-04-07 16:41:03 -0700 |
commit | 005c93b5d876edf670b4c71d8dd79dc4e845a099 (patch) | |
tree | 5ee50d6174e3ed9f4fec8fec9ca53e780b874a23 /drivers/net/wireless/ath | |
parent | fb9e2d887243499b8d28efcf80821c4f6a092395 (diff) | |
parent | 1144601118507f8b3b676a9a392584d216d3f2cc (diff) | |
download | op-kernel-dev-005c93b5d876edf670b4c71d8dd79dc4e845a099.zip op-kernel-dev-005c93b5d876edf670b4c71d8dd79dc4e845a099.tar.gz |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6
Diffstat (limited to 'drivers/net/wireless/ath')
-rw-r--r-- | drivers/net/wireless/ath/ath9k/main.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/net/wireless/ath/ath9k/main.c b/drivers/net/wireless/ath/ath9k/main.c index 67ca4e5..115e1ae 100644 --- a/drivers/net/wireless/ath/ath9k/main.c +++ b/drivers/net/wireless/ath/ath9k/main.c @@ -1532,8 +1532,7 @@ static int ath9k_config(struct ieee80211_hw *hw, u32 changed) all_wiphys_idle = ath9k_all_wiphys_idle(sc); ath9k_set_wiphy_idle(aphy, idle); - if (!idle && all_wiphys_idle) - enable_radio = true; + enable_radio = (!idle && all_wiphys_idle); /* * After we unlock here its possible another wiphy |