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: 6fa658fd5a
("ath9k: Simplify and fix eeprom endianness swapping")
Signed-off-by: Felix Fietkau <nbd@openwrt.org>
Acked-by: Martin Blumenstingl <martin.blumenstingl@googlemail.com>
Signed-off-by: Kalle Valo <kvalo@qca.qualcomm.com>
This commit is contained in:
Родитель
e0045bf80f
Коммит
65dc1a5d1e
|
@ -150,18 +150,18 @@ int ath9k_hw_nvram_swap_data(struct ath_hw *ah, bool *swap_needed, int size)
|
|||
return -EIO;
|
||||
}
|
||||
|
||||
if (magic == AR5416_EEPROM_MAGIC) {
|
||||
*swap_needed = false;
|
||||
} else if (swab16(magic) == AR5416_EEPROM_MAGIC) {
|
||||
*swap_needed = false;
|
||||
if (swab16(magic) == AR5416_EEPROM_MAGIC) {
|
||||
if (ah->ah_flags & AH_NO_EEP_SWAP) {
|
||||
ath_info(common,
|
||||
"Ignoring endianness difference in EEPROM magic bytes.\n");
|
||||
|
||||
*swap_needed = false;
|
||||
} else {
|
||||
*swap_needed = true;
|
||||
}
|
||||
} else {
|
||||
} else if (magic != AR5416_EEPROM_MAGIC) {
|
||||
if (ath9k_hw_use_flash(ah))
|
||||
return 0;
|
||||
|
||||
ath_err(common,
|
||||
"Invalid EEPROM Magic (0x%04x).\n", magic);
|
||||
return -EINVAL;
|
||||
|
|
Загрузка…
Ссылка в новой задаче