summaryrefslogtreecommitdiffstats
path: root/drivers/net
diff options
context:
space:
mode:
authorFelix Fietkau <nbd@openwrt.org>2010-04-06 12:05:01 -0700
committerGreg Kroah-Hartman <gregkh@suse.de>2010-04-26 07:47:51 -0700
commit0d54cd89c5cb669505946ab6789ef68b3a7d7f75 (patch)
treef992e9fe0a76e748d78bd7d56c15bdef4f6f7110 /drivers/net
parent328f7088efe2d95b00fe277c51896062aa82942e (diff)
downloadkernel-crypto-0d54cd89c5cb669505946ab6789ef68b3a7d7f75.tar.gz
kernel-crypto-0d54cd89c5cb669505946ab6789ef68b3a7d7f75.tar.xz
kernel-crypto-0d54cd89c5cb669505946ab6789ef68b3a7d7f75.zip
ath9k: fix double calls to ath_radio_enable
commit 1144601118507f8b3b676a9a392584d216d3f2cc upstream. With the enable_radio being uninitialized, ath_radio_enable() might be called twice, which can leave some hardware in an undefined state. Signed-off-by: Felix Fietkau <nbd@openwrt.org> Signed-off-by: John W. Linville <linville@tuxdriver.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/net')
-rw-r--r--drivers/net/wireless/ath/ath9k/main.c3
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 33a10716af8..7b1eab4d85c 100644
--- a/drivers/net/wireless/ath/ath9k/main.c
+++ b/drivers/net/wireless/ath/ath9k/main.c
@@ -2721,8 +2721,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