1 --- a/drivers/net/wireless/ath/ath9k/ar9002_calib.c
2 +++ b/drivers/net/wireless/ath/ath9k/ar9002_calib.c
3 @@ -660,7 +660,6 @@ static void ar9002_hw_olc_temp_compensat
4 static int ar9002_hw_calibrate(struct ath_hw *ah, struct ath9k_channel *chan,
5 u8 rxchainmask, bool longcal)
7 - bool iscaldone = true;
8 struct ath9k_cal_list *currCal = ah->cal_list_curr;
9 bool nfcal, nfcal_pending = false;
11 @@ -672,15 +671,13 @@ static int ar9002_hw_calibrate(struct at
12 if (currCal && !nfcal &&
13 (currCal->calState == CAL_RUNNING ||
14 currCal->calState == CAL_WAITING)) {
15 - iscaldone = ar9002_hw_per_calibration(ah, chan,
16 - rxchainmask, currCal);
18 - ah->cal_list_curr = currCal = currCal->calNext;
20 - if (currCal->calState == CAL_WAITING) {
22 - ath9k_hw_reset_calibration(ah, currCal);
24 + if (!ar9002_hw_per_calibration(ah, chan, rxchainmask, currCal))
27 + ah->cal_list_curr = currCal = currCal->calNext;
28 + if (currCal->calState == CAL_WAITING) {
29 + ath9k_hw_reset_calibration(ah, currCal);
34 @@ -710,7 +707,7 @@ static int ar9002_hw_calibrate(struct at
42 /* Carrier leakage Calibration fix */