]> git.proxmox.com Git - mirror_ubuntu-artful-kernel.git/commitdiff
ath9k: fix QCA9561 XLNA rxgain initial
authorMiaoqing Pan <miaoqing@codeaurora.org>
Tue, 29 Sep 2015 05:24:37 +0000 (13:24 +0800)
committerKalle Valo <kvalo@codeaurora.org>
Wed, 14 Oct 2015 11:15:57 +0000 (14:15 +0300)
A small bugfix for commit ede6a5e7b859 ("ath9k: Add QCA956x HW support").
I guess I would have skipped renaming (that initial QCA956x commit has
been there already for almost a year with the "5g" in the name) and move
the call outside AR_SREV_9462_20_OR_LATER() to make it reachable.

Signed-off-by: Miaoqing Pan <miaoqing@codeaurora.org>
Signed-off-by: Kalle Valo <kvalo@codeaurora.org>
drivers/net/wireless/ath/ath9k/ar9003_phy.c

index 296a69ebfbf6f1de6e9fd83ac6b00a095b2ffcab..201425e7f9cb94f031ad47d6d2366543b870d985 100644 (file)
@@ -929,16 +929,15 @@ static int ar9003_hw_process_ini(struct ath_hw *ah,
                        REG_WRITE_ARRAY(&ah->ini_modes_rxgain_xlna,
                                        modesIndex, regWrites);
                }
-
-               if (AR_SREV_9561(ah) && (ar9003_hw_get_rx_gain_idx(ah) == 0))
-                       REG_WRITE_ARRAY(&ah->ini_modes_rxgain_xlna,
-                                       modesIndex, regWrites);
        }
 
        if (AR_SREV_9550(ah) || AR_SREV_9561(ah))
                REG_WRITE_ARRAY(&ah->ini_modes_rx_gain_bounds, modesIndex,
                                regWrites);
 
+       if (AR_SREV_9561(ah) && (ar9003_hw_get_rx_gain_idx(ah) == 0))
+               REG_WRITE_ARRAY(&ah->ini_modes_rxgain_xlna,
+                               modesIndex, regWrites);
        /*
         * TXGAIN initvals.
         */