ath9k_hw: Fix INI fixup
authorSujith Manoharan <Sujith.Manoharan@atheros.com>
Wed, 26 Jan 2011 16:29:18 +0000 (21:59 +0530)
committerJohn W. Linville <linville@tuxdriver.com>
Fri, 28 Jan 2011 20:44:27 +0000 (15:44 -0500)
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>
drivers/net/wireless/ath/ath9k/eeprom_def.c

index c9318ff4096443595cdb0b80e4ee7f7fcb2e3d6f..fccd87df7300b27a91ed896325af85a134e8a9b0 100644 (file)
@@ -247,9 +247,9 @@ static int ath9k_hw_def_check_eeprom(struct ath_hw *ah)
        }
 
        /* Enable fixup for AR_AN_TOP2 if necessary */
-       if (AR_SREV_9280_20_OR_LATER(ah) &&
-           (eep->baseEepHeader.version & 0xff) > 0x0a &&
-           eep->baseEepHeader.pwdclkind == 0)
+       if ((ah->hw_version.devid == AR9280_DEVID_PCI) &&
+           ((eep->baseEepHeader.version & 0xff) > 0x0a) &&
+           (eep->baseEepHeader.pwdclkind == 0))
                ah->need_an_top2_fixup = 1;
 
        if ((common->bus_ops->ath_bus_type == ATH_USB) &&