tjh.dev
Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
Merge ath-current from ath.git
+6
-6
+6
-6
drivers/net/wireless/ath/ath9k/eeprom.c
+6
-6
drivers/net/wireless/ath/ath9k/eeprom.c
···
150
150
return -EIO;
151
151
}
152
152
153
-
if (magic == AR5416_EEPROM_MAGIC) {
154
-
*swap_needed = false;
155
-
} else if (swab16(magic) == AR5416_EEPROM_MAGIC) {
153
+
*swap_needed = false;
154
+
if (swab16(magic) == AR5416_EEPROM_MAGIC) {
156
155
if (ah->ah_flags & AH_NO_EEP_SWAP) {
157
156
ath_info(common,
158
157
"Ignoring endianness difference in EEPROM magic bytes.\n");
159
-
160
-
*swap_needed = false;
161
158
} else {
162
159
*swap_needed = true;
163
160
}
164
-
} else {
161
+
} else if (magic != AR5416_EEPROM_MAGIC) {
162
+
if (ath9k_hw_use_flash(ah))
163
+
return 0;
164
+
165
165
ath_err(common,
166
166
"Invalid EEPROM Magic (0x%04x).\n", magic);
167
167
return -EINVAL;