ath5k: precedence error in ath5k_hw_nic_wakeup()
authorDan Carpenter <dan.carpenter@oracle.com>
Wed, 14 Nov 2012 08:23:07 +0000 (11:23 +0300)
committerJohn W. Linville <linville@tuxdriver.com>
Fri, 16 Nov 2012 19:28:44 +0000 (14:28 -0500)
'|' has higher precedence than ?:.  Since AR5K_PHY_TURBO_MODE is 0x1 and
"AR5K_PHY_TURBO_MODE | (ah->ah_radio == AR5K_RF2425)" is true then we
always set turbo to zero.

Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
drivers/net/wireless/ath/ath5k/reset.c

index 0c2dd47..4084b10 100644 (file)
@@ -789,9 +789,9 @@ ath5k_hw_nic_wakeup(struct ath5k_hw *ah, struct ieee80211_channel *channel)
                 * (I don't think it supports 44MHz) */
                /* On 2425 initvals TURBO_SHORT is not present */
                if (ah->ah_bwmode == AR5K_BWMODE_40MHZ) {
-                       turbo = AR5K_PHY_TURBO_MODE |
-                               (ah->ah_radio == AR5K_RF2425) ? 0 :
-                               AR5K_PHY_TURBO_SHORT;
+                       turbo = AR5K_PHY_TURBO_MODE;
+                       if (ah->ah_radio != AR5K_RF2425)
+                               turbo |= AR5K_PHY_TURBO_SHORT;
                } else if (ah->ah_bwmode != AR5K_BWMODE_DEFAULT) {
                        if (ah->ah_radio == AR5K_RF5413) {
                                mode |= (ah->ah_bwmode == AR5K_BWMODE_10MHZ) ?