ath5k: add missing checks for rfgain probe
authorFelix Fietkau <nbd@openwrt.org>
Tue, 12 Jul 2011 01:01:58 +0000 (09:01 +0800)
committerJohn W. Linville <linville@tuxdriver.com>
Wed, 13 Jul 2011 18:49:36 +0000 (14:49 -0400)
rfgain probe is only necessary for OFDM operation on AR5111 and AR5112.

Signed-off-by: Felix Fietkau <nbd@openwrt.org>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
drivers/net/wireless/ath/ath5k/phy.c

index e00ab5a66940d2ed25ed44e9e0813d015937fb88..3f19e312203627fb13ac1d1b10aaeff4b70876d6 100644 (file)
@@ -1604,11 +1604,13 @@ int ath5k_hw_phy_calibrate(struct ath5k_hw *ah,
        int ret;
 
        if (ah->ah_radio == AR5K_RF5110)
-               ret = ath5k_hw_rf5110_calibrate(ah, channel);
-       else {
-               ret = ath5k_hw_rf511x_iq_calibrate(ah);
+               return ath5k_hw_rf5110_calibrate(ah, channel);
+
+       ret = ath5k_hw_rf511x_iq_calibrate(ah);
+
+       if ((ah->ah_radio == AR5K_RF5111 || ah->ah_radio == AR5K_RF5112) &&
+           (channel->hw_value & CHANNEL_OFDM))
                ath5k_hw_request_rfgain_probe(ah);
-       }
 
        return ret;
 }