aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/wireless/ath/ath9k/ar9002_calib.c
diff options
context:
space:
mode:
authorRobert Shade <robert.shade@gmail.com>2013-03-27 11:46:27 -0400
committerJohn W. Linville <linville@tuxdriver.com>2013-03-27 13:39:08 -0400
commit05005c5f290cf0c4f1d4173d18fc90ea2223a043 (patch)
treeeb6adb92b054b6844a0ea167a4e11f685b85d379 /drivers/net/wireless/ath/ath9k/ar9002_calib.c
parent56771e5054463fd3ec2047ea4d4a26111ec7dbab (diff)
Show actual timeout value in failed calibration messages.
The messages are currently hard coding "1ms", which does not match the actual timeout being used. Signed-off-by: Robert Shade <robert.shade@gmail.com> Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'drivers/net/wireless/ath/ath9k/ar9002_calib.c')
-rw-r--r--drivers/net/wireless/ath/ath9k/ar9002_calib.c9
1 files changed, 6 insertions, 3 deletions
diff --git a/drivers/net/wireless/ath/ath9k/ar9002_calib.c b/drivers/net/wireless/ath/ath9k/ar9002_calib.c
index c55e5bbafc46..9f589744a9f9 100644
--- a/drivers/net/wireless/ath/ath9k/ar9002_calib.c
+++ b/drivers/net/wireless/ath/ath9k/ar9002_calib.c
@@ -731,7 +731,8 @@ static bool ar9285_hw_cl_cal(struct ath_hw *ah, struct ath9k_channel *chan)
731 if (!ath9k_hw_wait(ah, AR_PHY_AGC_CONTROL, 731 if (!ath9k_hw_wait(ah, AR_PHY_AGC_CONTROL,
732 AR_PHY_AGC_CONTROL_CAL, 0, AH_WAIT_TIMEOUT)) { 732 AR_PHY_AGC_CONTROL_CAL, 0, AH_WAIT_TIMEOUT)) {
733 ath_dbg(common, CALIBRATE, 733 ath_dbg(common, CALIBRATE,
734 "offset calibration failed to complete in 1ms; noisy environment?\n"); 734 "offset calibration failed to complete in %d ms; noisy environment?\n",
735 AH_WAIT_TIMEOUT / 1000);
735 return false; 736 return false;
736 } 737 }
737 REG_CLR_BIT(ah, AR_PHY_TURBO, AR_PHY_FC_DYN2040_EN); 738 REG_CLR_BIT(ah, AR_PHY_TURBO, AR_PHY_FC_DYN2040_EN);
@@ -745,7 +746,8 @@ static bool ar9285_hw_cl_cal(struct ath_hw *ah, struct ath9k_channel *chan)
745 if (!ath9k_hw_wait(ah, AR_PHY_AGC_CONTROL, AR_PHY_AGC_CONTROL_CAL, 746 if (!ath9k_hw_wait(ah, AR_PHY_AGC_CONTROL, AR_PHY_AGC_CONTROL_CAL,
746 0, AH_WAIT_TIMEOUT)) { 747 0, AH_WAIT_TIMEOUT)) {
747 ath_dbg(common, CALIBRATE, 748 ath_dbg(common, CALIBRATE,
748 "offset calibration failed to complete in 1ms; noisy environment?\n"); 749 "offset calibration failed to complete in %d ms; noisy environment?\n",
750 AH_WAIT_TIMEOUT / 1000);
749 return false; 751 return false;
750 } 752 }
751 753
@@ -841,7 +843,8 @@ static bool ar9002_hw_init_cal(struct ath_hw *ah, struct ath9k_channel *chan)
841 AR_PHY_AGC_CONTROL_CAL, 843 AR_PHY_AGC_CONTROL_CAL,
842 0, AH_WAIT_TIMEOUT)) { 844 0, AH_WAIT_TIMEOUT)) {
843 ath_dbg(common, CALIBRATE, 845 ath_dbg(common, CALIBRATE,
844 "offset calibration failed to complete in 1ms; noisy environment?\n"); 846 "offset calibration failed to complete in %d ms; noisy environment?\n",
847 AH_WAIT_TIMEOUT / 1000);
845 return false; 848 return false;
846 } 849 }
847 850