diff options
| author | David S. Miller <davem@davemloft.net> | 2012-04-25 15:13:37 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2012-04-25 15:13:37 -0400 |
| commit | 202149265770426f0965557ffa0b500fbbd701dd (patch) | |
| tree | 3a6fe0c357b6eb6ac5e15a0ec27eaf570ebfd0ce /drivers/net/wireless/ath/ath9k/ar5008_phy.c | |
| parent | f891ea1634ce41f5f47ae40d8594809f4cd2ca66 (diff) | |
| parent | 395836282f7cf8b1dac9b9c2aa2bacddfa1580b5 (diff) | |
Merge branch 'for-davem' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless
Diffstat (limited to 'drivers/net/wireless/ath/ath9k/ar5008_phy.c')
| -rw-r--r-- | drivers/net/wireless/ath/ath9k/ar5008_phy.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/wireless/ath/ath9k/ar5008_phy.c b/drivers/net/wireless/ath/ath9k/ar5008_phy.c index d7d8e9199140..aba088005b22 100644 --- a/drivers/net/wireless/ath/ath9k/ar5008_phy.c +++ b/drivers/net/wireless/ath/ath9k/ar5008_phy.c | |||
| @@ -869,7 +869,7 @@ static int ar5008_hw_process_ini(struct ath_hw *ah, | |||
| 869 | ar5008_hw_set_channel_regs(ah, chan); | 869 | ar5008_hw_set_channel_regs(ah, chan); |
| 870 | ar5008_hw_init_chain_masks(ah); | 870 | ar5008_hw_init_chain_masks(ah); |
| 871 | ath9k_olc_init(ah); | 871 | ath9k_olc_init(ah); |
| 872 | ath9k_hw_apply_txpower(ah, chan); | 872 | ath9k_hw_apply_txpower(ah, chan, false); |
| 873 | 873 | ||
| 874 | /* Write analog registers */ | 874 | /* Write analog registers */ |
| 875 | if (!ath9k_hw_set_rf_regs(ah, chan, freqIndex)) { | 875 | if (!ath9k_hw_set_rf_regs(ah, chan, freqIndex)) { |