ath5k: ath5k_eeprom_mode_from_channel() returns

PATCH New Dan Carpenter 1 participant 1 message Jan 3, 2011

Subsystems (2)

Kernel janitors Atheros ATH5K wireless driver

lore

Share & tools

lore

Dan Carpenter

author

2011-01-03 05:46 UTC #0 lore raw

PATCH 1/1 ath5k: ath5k_eeprom_mode_from_channel() returns

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 <[email protected]>

drivers/net/wireless/ath/ath5k/phy.c +4 -2

index 9306d5f..78c26fd 100644
@@ -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) {