Merge ath-next from ath.git

[linux-2.6-block.git] / drivers / net / wireless / ath / ath9k / ar9003_eeprom.c

diff --git a/drivers/net/wireless/ath/ath9k/ar9003_eeprom.c b/drivers/net/wireless/ath/ath9k/ar9003_eeprom.c
index 36b60257790531c1b69d8c0efd3111a6ac177a1a..f68098284c43be41562b3f126cbe1409134a1868 100644 (file)
--- a/drivers/net/wireless/ath/ath9k/ar9003_eeprom.c
+++ b/drivers/net/wireless/ath/ath9k/ar9003_eeprom.c
@@ -4097,16 +4097,16 @@ static void ar9003_hw_thermometer_apply(struct ath_hw *ah)
                REG_RMW_FIELD(ah, AR_PHY_65NM_CH2_RXTX4,
                              AR_PHY_65NM_CH0_RXTX4_THERM_ON_OVR, therm_on);
 
-       therm_on = (thermometer < 0) ? 0 : (thermometer == 0);
+       therm_on = thermometer == 0;
        REG_RMW_FIELD(ah, AR_PHY_65NM_CH0_RXTX4,
                      AR_PHY_65NM_CH0_RXTX4_THERM_ON, therm_on);
        if (pCap->chip_chainmask & BIT(1)) {
-               therm_on = (thermometer < 0) ? 0 : (thermometer == 1);
+               therm_on = thermometer == 1;
                REG_RMW_FIELD(ah, AR_PHY_65NM_CH1_RXTX4,
                              AR_PHY_65NM_CH0_RXTX4_THERM_ON, therm_on);
        }
        if (pCap->chip_chainmask & BIT(2)) {
-               therm_on = (thermometer < 0) ? 0 : (thermometer == 2);
+               therm_on = thermometer == 2;
                REG_RMW_FIELD(ah, AR_PHY_65NM_CH2_RXTX4,
                              AR_PHY_65NM_CH0_RXTX4_THERM_ON, therm_on);
        }