Commit 3b3ee43d authored Aug 26, 2009 by Pavel Roskin Committed by John W. Linville Aug 28, 2009

ath5k: fix uninitialized value use in ath5k_eeprom_read_turbo_modes()



The `val' variable in ath5k_eeprom_read_turbo_modes() is used
uninitialized.  gcc 4.4.1 with -fno-inline-functions-called-once reports
it:

eeprom.c: In function 'ath5k_eeprom_read_turbo_modes':
eeprom.c:441: warning: 'val' may be used uninitialized in this function

Comparing the code to the Atheros HAL, it's clear that the split between
ath5k_eeprom_read_modes() and ath5k_eeprom_read_turbo_modes() was
incorrect.

The Atheros HAL reads both turbo and non-turbo data from EEPROM in one
function.  Some turbo mode parameters are derived from the same EEPROM
values as non-turbo parameters, just from different bits.

Merge ath5k_eeprom_read_turbo_modes() into ath5k_eeprom_read_modes() to
fix the warning.  The actual values and offsets have been cross-checked
against Atheros HAL.

Signed-off-by: Pavel Roskin <proski@gnu.org>
Acked-by: Bob Copeland <me@bobcopeland.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>

parent ca5efbe2

drivers/net/wireless/ath/ath5k/eeprom.c

+5 −24

Original line number	Diff line number	Diff line
		@@ -414,27 +414,11 @@ static int ath5k_eeprom_read_modes(struct ath5k_hw ah, u32 offset,
		break;
		}

		done:
		/* return new offset */
		*offset = o;

		return 0;
		}

		/*
		* Read turbo mode information on newer EEPROM versions
		*/
		static int
		ath5k_eeprom_read_turbo_modes(struct ath5k_hw *ah,
		u32 *offset, unsigned int mode)
		{
		struct ath5k_eeprom_info *ee = &ah->ah_capabilities.cap_eeprom;
		u32 o = *offset;
		u16 val;
		int ret;

		if (ee->ee_version < AR5K_EEPROM_VERSION_5_0)
		return 0;
		goto done;

		switch (mode){
		case AR5K_EEPROM_MODE_11A:
		@@ -468,6 +452,7 @@ ath5k_eeprom_read_turbo_modes(struct ath5k_hw *ah,
		break;
		}

		done:
		/* return new offset */
		*offset = o;

		@@ -504,10 +489,6 @@ ath5k_eeprom_init_modes(struct ath5k_hw *ah)
		ret = ath5k_eeprom_read_modes(ah, &offset, mode);
		if (ret)
		return ret;

		ret = ath5k_eeprom_read_turbo_modes(ah, &offset, mode);
		if (ret)
		return ret;
		}

		/* override for older eeprom versions for better performance */