diff options
author | Vasanthakumar Thiagarajan <vasanth@atheros.com> | 2010-06-24 07:09:27 -0400 |
---|---|---|
committer | John W. Linville <linville@tuxdriver.com> | 2010-06-24 15:42:43 -0400 |
commit | 47399f1a7d2059c89df7a1116024d0cd9bc240fa (patch) | |
tree | 3b28861e7f0c69c96f94f7cdb641c5c6480dda09 | |
parent | 78a181725162c33cdc8907c3c224bd8b6b628f0e (diff) |
ath9k: Wakeup the chip in an appropriate place in ath_paprd_calibrate()
Move ath9k_ps_wakeup() down just before accessing hw registers.
Signed-off-by: Vasanthakumar Thiagarajan <vasanth@atheros.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
-rw-r--r-- | drivers/net/wireless/ath/ath9k/main.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/wireless/ath/ath9k/main.c b/drivers/net/wireless/ath/ath9k/main.c index c070e01c8de3..87356fc6f4cd 100644 --- a/drivers/net/wireless/ath/ath9k/main.c +++ b/drivers/net/wireless/ath/ath9k/main.c | |||
@@ -268,7 +268,6 @@ void ath_paprd_calibrate(struct work_struct *work) | |||
268 | int time_left; | 268 | int time_left; |
269 | int i; | 269 | int i; |
270 | 270 | ||
271 | ath9k_ps_wakeup(sc); | ||
272 | skb = alloc_skb(len, GFP_KERNEL); | 271 | skb = alloc_skb(len, GFP_KERNEL); |
273 | if (!skb) | 272 | if (!skb) |
274 | return; | 273 | return; |
@@ -289,6 +288,7 @@ void ath_paprd_calibrate(struct work_struct *work) | |||
289 | qnum = sc->tx.hwq_map[WME_AC_BE]; | 288 | qnum = sc->tx.hwq_map[WME_AC_BE]; |
290 | txctl.txq = &sc->tx.txq[qnum]; | 289 | txctl.txq = &sc->tx.txq[qnum]; |
291 | 290 | ||
291 | ath9k_ps_wakeup(sc); | ||
292 | ar9003_paprd_init_table(ah); | 292 | ar9003_paprd_init_table(ah); |
293 | for (chain = 0; chain < AR9300_MAX_CHAINS; chain++) { | 293 | for (chain = 0; chain < AR9300_MAX_CHAINS; chain++) { |
294 | if (!(ah->caps.tx_chainmask & BIT(chain))) | 294 | if (!(ah->caps.tx_chainmask & BIT(chain))) |