Merge remote-tracking branch 'regmap/fix/cache' into regmap-linus

[firefly-linux-kernel-4.4.55.git] / drivers / net / wireless / ath / ath9k / ar9003_calib.c

diff --git a/drivers/net/wireless/ath/ath9k/ar9003_calib.c b/drivers/net/wireless/ath/ath9k/ar9003_calib.c
index f76c3ca07a4501603883bbcbe9feb901d4eca390..6988e1d081f225c0c0a8efd0dc49fbacb4fc6a1a 100644 (file)
--- a/drivers/net/wireless/ath/ath9k/ar9003_calib.c
+++ b/drivers/net/wireless/ath/ath9k/ar9003_calib.c
@@ -965,7 +965,7 @@ static void ar9003_hw_do_manual_peak_cal(struct ath_hw *ah,
 {
        int i;
 
-       if (!AR_SREV_9462(ah) && !AR_SREV_9565(ah))
+       if (!AR_SREV_9462(ah) && !AR_SREV_9565(ah) && !AR_SREV_9485(ah))
                return;
 
        for (i = 0; i < AR9300_MAX_CHAINS; i++) {
@@ -1126,7 +1126,8 @@ skip_tx_iqcal:
                        ar9003_hw_rtt_disable(ah);
 
                ath_dbg(common, CALIBRATE,
-                       "offset calibration failed to complete in 1ms; noisy environment?\n");
+                       "offset calibration failed to complete in %d ms; noisy environment?\n",
+                       AH_WAIT_TIMEOUT / 1000);
                return false;
        }