aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSujith <Sujith.Manoharan@atheros.com>2009-09-16 23:58:41 -0400
committerJohn W. Linville <linville@tuxdriver.com>2009-09-23 11:35:52 -0400
commitedbf51f65eefb952a03c00eadefa9aa48580fcc6 (patch)
treec34b44424047962e65c9b71e4d2e7dbf3d2ee7d1
parentd865ca6c147552a1c38161e2e262c4ab59e762d6 (diff)
ath9k: Fix regression in PA calibration
The commit "ath9k: Fix bugs in programming registers during PA CAL" removed a REG_READ of 0x7834. This resulted in incorrect computation of the subsequent value to be written in RF2G6. This patch fixes the regression by re-adding the REG_READ. Signed-off-by: Sujith <Sujith.Manoharan@atheros.com> Signed-off-by: John W. Linville <linville@tuxdriver.com>
-rw-r--r--drivers/net/wireless/ath/ath9k/calib.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/net/wireless/ath/ath9k/calib.c b/drivers/net/wireless/ath/ath9k/calib.c
index 22a3a6903867..0ad6d0b76e9e 100644
--- a/drivers/net/wireless/ath/ath9k/calib.c
+++ b/drivers/net/wireless/ath/ath9k/calib.c
@@ -936,6 +936,7 @@ static inline void ath9k_hw_9285_pa_cal(struct ath_hw *ah, bool is_reset)
936 regVal |= (1 << (19 + i)); 936 regVal |= (1 << (19 + i));
937 REG_WRITE(ah, 0x7834, regVal); 937 REG_WRITE(ah, 0x7834, regVal);
938 udelay(1); 938 udelay(1);
939 regVal = REG_READ(ah, 0x7834);
939 regVal &= (~(0x1 << (19 + i))); 940 regVal &= (~(0x1 << (19 + i)));
940 reg_field = MS(REG_READ(ah, 0x7840), AR9285_AN_RXTXBB1_SPARE9); 941 reg_field = MS(REG_READ(ah, 0x7840), AR9285_AN_RXTXBB1_SPARE9);
941 regVal |= (reg_field << (19 + i)); 942 regVal |= (reg_field << (19 + i));