From: Felix Fietkau Date: Mon, 30 Jul 2018 18:31:17 +0000 (+0300) Subject: ath9k: don't run periodic and nf calibation at the same time X-Git-Tag: v4.19-rc1~140^2~25^2~13^2~25 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=3a69dd366866b066b329f6074189a1a6eb056b93;p=thirdparty%2Fkernel%2Flinux.git 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 Signed-off-by: Kalle Valo --- diff --git a/drivers/net/wireless/ath/ath9k/ar9002_calib.c b/drivers/net/wireless/ath/ath9k/ar9002_calib.c index 50fcd343c41af..fd9db8ca99d79 100644 --- 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 */