]> git.karo-electronics.de Git - mv-sheeva.git/commitdiff
ath5k: ath5k_eeprom_mode_from_channel() returns signed
authorDan Carpenter <error27@gmail.com>
Mon, 3 Jan 2011 05:46:29 +0000 (08:46 +0300)
committerJohn W. Linville <linville@tuxdriver.com>
Tue, 4 Jan 2011 19:46:13 +0000 (14:46 -0500)
ath5k_eeprom_mode_from_channel() returns -1 on error but we're storing
the result in "ee_mode" which is an unsigned char.  This breaks the
error handling.  This patch makes "ee_mode" an int.

Signed-off-by: Dan Carpenter <error27@gmail.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
drivers/net/wireless/ath/ath5k/phy.c

index 9306d5fda6753df363a35b6fa9ff5dea20b4a0e3..78c26fdccad1389c8d8a6ef88459c934e7776c00 100644 (file)
@@ -1916,7 +1916,8 @@ ath5k_hw_set_antenna_mode(struct ath5k_hw *ah, u8 ant_mode)
        struct ieee80211_channel *channel = ah->ah_current_channel;
        bool use_def_for_tx, update_def_on_tx, use_def_for_rts, fast_div;
        bool use_def_for_sg;
-       u8 def_ant, tx_ant, ee_mode;
+       int ee_mode;
+       u8 def_ant, tx_ant;
        u32 sta_id1 = 0;
 
        /* if channel is not initialized yet we can't set the antennas
@@ -3081,7 +3082,8 @@ ath5k_hw_txpower(struct ath5k_hw *ah, struct ieee80211_channel *channel,
 {
        struct ath5k_rate_pcal_info rate_info;
        struct ieee80211_channel *curr_channel = ah->ah_current_channel;
-       u8 type, ee_mode;
+       int ee_mode;
+       u8 type;
        int ret;
 
        if (txpower > AR5K_TUNE_MAX_TXPOWER) {