diff options
| author | Rajkumar Manoharan <rmanoharan@atheros.com> | 2010-08-13 18:36:40 +0530 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2010-08-13 13:46:20 -0400 |
| commit | ca6cff1f80f30cc6313a943339361ad6f9e76548 (patch) | |
| tree | fdbc896961b96bab7dba33232d4c0dc361e145a2 /drivers/net/wireless/ath/ath9k/eeprom_9287.c | |
| parent | fe0dbcc9d2e941328b3269dab102b94ad697ade5 (diff) | |
| download | blackbird-op-linux-ca6cff1f80f30cc6313a943339361ad6f9e76548.tar.gz blackbird-op-linux-ca6cff1f80f30cc6313a943339361ad6f9e76548.zip | |
ath9k_htc: load proper firmware for device ID 7015
This patch handles the firmware loading properly
for device ID 7015.
Signed-off-by: Rajkumar Manoharan <rmanoharan@atheros.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'drivers/net/wireless/ath/ath9k/eeprom_9287.c')
| -rw-r--r-- | drivers/net/wireless/ath/ath9k/eeprom_9287.c | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/drivers/net/wireless/ath/ath9k/eeprom_9287.c b/drivers/net/wireless/ath/ath9k/eeprom_9287.c index 4a52cf03808b..dff2da777312 100644 --- a/drivers/net/wireless/ath/ath9k/eeprom_9287.c +++ b/drivers/net/wireless/ath/ath9k/eeprom_9287.c @@ -34,9 +34,14 @@ static bool ath9k_hw_ar9287_fill_eeprom(struct ath_hw *ah) struct ar9287_eeprom *eep = &ah->eeprom.map9287; struct ath_common *common = ath9k_hw_common(ah); u16 *eep_data; - int addr, eep_start_loc = AR9287_EEP_START_LOC; + int addr, eep_start_loc; eep_data = (u16 *)eep; + if (ah->hw_version.devid == 0x7015) + eep_start_loc = AR9287_HTC_EEP_START_LOC; + else + eep_start_loc = AR9287_EEP_START_LOC; + if (!ath9k_hw_use_flash(ah)) { ath_print(common, ATH_DBG_EEPROM, "Reading from EEPROM, not flash\n"); |
