ath9k: don't run periodic and nf calibation at the same time

The checks already prevents periodic cal from being started while noise
floor calibration runs. It is missing checks for the other way around.

Signed-off-by: Felix Fietkau <nbd@nbd.name>
Signed-off-by: Kalle Valo <kvalo@codeaurora.org>

diff --git a/drivers/net/wireless/ath/ath9k/ar9002_calib.c b/drivers/net/wireless/ath/ath9k/ar9002_calib.c
index 50fcd343c41af12d865d55f1ceb5427797bd20d7..fd9db8ca99d79b1f9ca438035788f5782a0abd95 100644 (file)
--- a/drivers/net/wireless/ath/ath9k/ar9002_calib.c
+++ b/drivers/net/wireless/ath/ath9k/ar9002_calib.c
@@ -676,10 +676,10 @@ static int ar9002_hw_calibrate(struct ath_hw *ah, struct ath9k_channel *chan,
                        return 0;
 
                ah->cal_list_curr = currCal = currCal->calNext;
-               if (currCal->calState == CAL_WAITING) {
+               if (currCal->calState == CAL_WAITING)
                        ath9k_hw_reset_calibration(ah, currCal);
-                       return 0;
-               }
+
+               return 0;
        }
 
        /* Do NF cal only at longer intervals */