summaryrefslogtreecommitdiffstats
path: root/drivers/net/wireless/ath
diff options
context:
space:
mode:
authorVivek Natarajan <vnatarajan@atheros.com>2011-02-25 13:01:02 +0100
committerJohn W. Linville <linville@tuxdriver.com>2011-02-25 21:33:39 +0100
commit7e3514fdc0f2c1c007f46f0ca584808edbfaee8f (patch)
treeb8fb3dab92741c250b27ca2583ead9bd8da0e4fe /drivers/net/wireless/ath
parentath9k_hw: Fix pcie_serdes setting for AR9485 1.1 version. (diff)
downloadlinux-7e3514fdc0f2c1c007f46f0ca584808edbfaee8f.tar.xz
linux-7e3514fdc0f2c1c007f46f0ca584808edbfaee8f.zip
ath9k: Cancel pll_work while disabling radio.
pll_work should be cancelled on full_sleep or it may cause redundant chip reset. Signed-off-by: Vivek Natarajan <vnatarajan@atheros.com> Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'drivers/net/wireless/ath')
-rw-r--r--drivers/net/wireless/ath/ath9k/main.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/drivers/net/wireless/ath/ath9k/main.c b/drivers/net/wireless/ath/ath9k/main.c
index 39a72ae80970..b8496696460e 100644
--- a/drivers/net/wireless/ath/ath9k/main.c
+++ b/drivers/net/wireless/ath/ath9k/main.c
@@ -910,6 +910,8 @@ void ath_radio_enable(struct ath_softc *sc, struct ieee80211_hw *hw)
ath9k_hw_set_gpio(ah, ah->led_pin, 0);
ieee80211_wake_queues(hw);
+ ieee80211_queue_delayed_work(hw, &sc->hw_pll_work, HZ/2);
+
out:
spin_unlock_bh(&sc->sc_pcu_lock);
@@ -923,6 +925,8 @@ void ath_radio_disable(struct ath_softc *sc, struct ieee80211_hw *hw)
int r;
ath9k_ps_wakeup(sc);
+ cancel_delayed_work_sync(&sc->hw_pll_work);
+
spin_lock_bh(&sc->sc_pcu_lock);
ieee80211_stop_queues(hw);