Commit 65dc1a5d authored by Felix Fietkau's avatar Felix Fietkau Committed by Kalle Valo

ath9k_hw: ignore eeprom magic mismatch on flash based devices

Many AR913x based devices (maybe others too) do not have a valid EEPROM
magic in their calibration data partition.

Fixes: 6fa658fd ("ath9k: Simplify and fix eeprom endianness swapping")
Signed-off-by: default avatarFelix Fietkau <nbd@openwrt.org>
Acked-by: default avatarMartin Blumenstingl <martin.blumenstingl@googlemail.com>
Signed-off-by: default avatarKalle Valo <kvalo@qca.qualcomm.com>
parent e0045bf8
...@@ -150,18 +150,18 @@ int ath9k_hw_nvram_swap_data(struct ath_hw *ah, bool *swap_needed, int size) ...@@ -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;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment