diff options
author | Lorenzo Bianconi <lorenzo.bianconi83@gmail.com> | 2013-12-12 12:10:16 -0500 |
---|---|---|
committer | John W. Linville <linville@tuxdriver.com> | 2013-12-18 15:23:04 -0500 |
commit | 935d00ccf7321d704a1bf8e982dd6934165c1327 (patch) | |
tree | 808d61a905574e5867a69844b5d22c846bc77ec6 /drivers/net | |
parent | 1e51acaa02563ca96c0f3fa9827174cefde6093c (diff) |
ath9k: fix 5/10MHz channel width initialization on ar9003
Move ath9k_hw_set_rfmode() after ath9k_hw_process_ini() in order to avoid
AR_PHY_MODE register is overwritten with default values by
ar9003_hw_process_ini()
Signed-off-by: Lorenzo Bianconi <lorenzo.bianconi83@gmail.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'drivers/net')
-rw-r--r-- | drivers/net/wireless/ath/ath9k/hw.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/net/wireless/ath/ath9k/hw.c b/drivers/net/wireless/ath/ath9k/hw.c index 4ee24b1eec38..1de98b895356 100644 --- a/drivers/net/wireless/ath/ath9k/hw.c +++ b/drivers/net/wireless/ath/ath9k/hw.c | |||
@@ -1485,7 +1485,6 @@ static bool ath9k_hw_chip_reset(struct ath_hw *ah, | |||
1485 | if (AR_SREV_9330(ah)) | 1485 | if (AR_SREV_9330(ah)) |
1486 | ar9003_hw_internal_regulator_apply(ah); | 1486 | ar9003_hw_internal_regulator_apply(ah); |
1487 | ath9k_hw_init_pll(ah, chan); | 1487 | ath9k_hw_init_pll(ah, chan); |
1488 | ath9k_hw_set_rfmode(ah, chan); | ||
1489 | 1488 | ||
1490 | return true; | 1489 | return true; |
1491 | } | 1490 | } |
@@ -1954,6 +1953,8 @@ int ath9k_hw_reset(struct ath_hw *ah, struct ath9k_channel *chan, | |||
1954 | if (r) | 1953 | if (r) |
1955 | return r; | 1954 | return r; |
1956 | 1955 | ||
1956 | ath9k_hw_set_rfmode(ah, chan); | ||
1957 | |||
1957 | if (ath9k_hw_mci_is_enabled(ah)) | 1958 | if (ath9k_hw_mci_is_enabled(ah)) |
1958 | ar9003_mci_reset(ah, false, IS_CHAN_2GHZ(chan), save_fullsleep); | 1959 | ar9003_mci_reset(ah, false, IS_CHAN_2GHZ(chan), save_fullsleep); |
1959 | 1960 | ||