Merge remote-tracking branch 'sound-current/for-linus'

[karo-tx-linux.git] / drivers / net / wireless / ath / ath9k / ar9003_phy.c

diff --git a/drivers/net/wireless/ath/ath9k/ar9003_phy.c b/drivers/net/wireless/ath/ath9k/ar9003_phy.c
index 1ad66b76749b7cbfd6d76fd40843744512308ef8..201425e7f9cb94f031ad47d6d2366543b870d985 100644 (file)
--- a/drivers/net/wireless/ath/ath9k/ar9003_phy.c
+++ b/drivers/net/wireless/ath/ath9k/ar9003_phy.c
@@ -926,19 +926,18 @@ static int ar9003_hw_process_ini(struct ath_hw *ah,
                 */
                if ((ar9003_hw_get_rx_gain_idx(ah) == 2) ||
                    (ar9003_hw_get_rx_gain_idx(ah) == 3)) {
-                       REG_WRITE_ARRAY(&ah->ini_modes_rxgain_5g_xlna,
+                       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_5g_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.
         */