]> git.proxmox.com Git - mirror_ubuntu-kernels.git/commitdiff
ath9k: Wakeup the chip in an appropriate place in ath_paprd_calibrate()
authorVasanthakumar Thiagarajan <vasanth@atheros.com>
Thu, 24 Jun 2010 11:09:27 +0000 (04:09 -0700)
committerJohn W. Linville <linville@tuxdriver.com>
Thu, 24 Jun 2010 19:42:43 +0000 (15:42 -0400)
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>
drivers/net/wireless/ath/ath9k/main.c

index c070e01c8de3b253a66b5ef1d81df7ef2d5b1ea3..87356fc6f4cd212a23ae07a424c4d5fe47a827a4 100644 (file)
@@ -268,7 +268,6 @@ void ath_paprd_calibrate(struct work_struct *work)
        int time_left;
        int i;
 
-       ath9k_ps_wakeup(sc);
        skb = alloc_skb(len, GFP_KERNEL);
        if (!skb)
                return;
@@ -289,6 +288,7 @@ void ath_paprd_calibrate(struct work_struct *work)
        qnum = sc->tx.hwq_map[WME_AC_BE];
        txctl.txq = &sc->tx.txq[qnum];
 
+       ath9k_ps_wakeup(sc);
        ar9003_paprd_init_table(ah);
        for (chain = 0; chain < AR9300_MAX_CHAINS; chain++) {
                if (!(ah->caps.tx_chainmask & BIT(chain)))