aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/wireless
diff options
context:
space:
mode:
authorSujith Manoharan <Sujith.Manoharan@atheros.com>2011-01-26 11:29:18 -0500
committerJohn W. Linville <linville@tuxdriver.com>2011-01-28 15:44:27 -0500
commit4d9067405c21e8596087d929f3d858d0aa5002ff (patch)
tree341715873718f915d18f70ac3eefe0e37f812d32 /drivers/net/wireless
parent00e0003e0969517c5a447ac3173442dfbdb0613b (diff)
ath9k_hw: Fix INI fixup
Commit "ath9k_hw: move AR9280 PCI EEPROM fix to eeprom_def.c" changed the behavior of INI overriding which is needed only for PCI cards. Revert to the original check. Signed-off-by: Sujith Manoharan <Sujith.Manoharan@atheros.com> Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'drivers/net/wireless')
-rw-r--r--drivers/net/wireless/ath/ath9k/eeprom_def.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/net/wireless/ath/ath9k/eeprom_def.c b/drivers/net/wireless/ath/ath9k/eeprom_def.c
index c9318ff40964..fccd87df7300 100644
--- a/drivers/net/wireless/ath/ath9k/eeprom_def.c
+++ b/drivers/net/wireless/ath/ath9k/eeprom_def.c
@@ -247,9 +247,9 @@ static int ath9k_hw_def_check_eeprom(struct ath_hw *ah)
247 } 247 }
248 248
249 /* Enable fixup for AR_AN_TOP2 if necessary */ 249 /* Enable fixup for AR_AN_TOP2 if necessary */
250 if (AR_SREV_9280_20_OR_LATER(ah) && 250 if ((ah->hw_version.devid == AR9280_DEVID_PCI) &&
251 (eep->baseEepHeader.version & 0xff) > 0x0a && 251 ((eep->baseEepHeader.version & 0xff) > 0x0a) &&
252 eep->baseEepHeader.pwdclkind == 0) 252 (eep->baseEepHeader.pwdclkind == 0))
253 ah->need_an_top2_fixup = 1; 253 ah->need_an_top2_fixup = 1;
254 254
255 if ((common->bus_ops->ath_bus_type == ATH_USB) && 255 if ((common->bus_ops->ath_bus_type == ATH_USB) &&