openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge ath-current from ath.git

This commit is contained in:
Kalle Valo 2016-01-26 15:41:30 +02:00
parent c72fc90937 65dc1a5d1e
commit 36efee8e9c
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
drivers/net/wireless/ath/ath9k/eeprom.c
View File

@ -150,18 +150,18 @@ int ath9k_hw_nvram_swap_data(struct ath_hw *ah, bool *swap_needed, int size)
return -EIO; return -EIO;
} }
if (magic == AR5416_EEPROM_MAGIC) { *swap_needed = false;
*swap_needed = false; if (swab16(magic) == AR5416_EEPROM_MAGIC) {
} else if (swab16(magic) == AR5416_EEPROM_MAGIC) {
if (ah->ah_flags & AH_NO_EEP_SWAP) { if (ah->ah_flags & AH_NO_EEP_SWAP) {
ath_info(common, ath_info(common,
"Ignoring endianness difference in EEPROM magic bytes.\n"); "Ignoring endianness difference in EEPROM magic bytes.\n");
*swap_needed = false;
} else { } else {
*swap_needed = true; *swap_needed = true;
} }
} else { } else if (magic != AR5416_EEPROM_MAGIC) {
if (ath9k_hw_use_flash(ah))
return 0;
ath_err(common, ath_err(common,
"Invalid EEPROM Magic (0x%04x).\n", magic); "Invalid EEPROM Magic (0x%04x).\n", magic);
return -EINVAL; return -EINVAL;