Message ID | 20180723160300.58024-2-nbd@nbd.name (mailing list archive) |
---|---|
State | Accepted |
Commit | 3a69dd366866b066b329f6074189a1a6eb056b93 |
Delegated to: | Kalle Valo |
Headers | show |
Series | [1/9] ath9k_hw: set spectral scan enable bit on trigger for AR9003+ | expand |
diff --git a/drivers/net/wireless/ath/ath9k/ar9002_calib.c b/drivers/net/wireless/ath/ath9k/ar9002_calib.c index 50fcd343c41a..fd9db8ca99d7 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 */
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> --- drivers/net/wireless/ath/ath9k/ar9002_calib.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)