diff options
author | John W. Linville <linville@tuxdriver.com> | 2014-11-19 20:38:48 (GMT) |
---|---|---|
committer | John W. Linville <linville@tuxdriver.com> | 2014-11-19 20:38:48 (GMT) |
commit | ab1f5a532c9d33b49b039660c5ecbc0ab53e7133 (patch) | |
tree | a1c1d820f2280535978632c5935462efcf5a4c7f /drivers/net/wireless/ath/ath9k/common.c | |
parent | f48ecb19bc0443a4272dd0934e7bee4480610df9 (diff) | |
parent | 4e6ce4dc7ce71d0886908d55129d5d6482a27ff9 (diff) | |
download | linux-ab1f5a532c9d33b49b039660c5ecbc0ab53e7133.tar.xz |
Merge commit '4e6ce4dc7ce71d0886908d55129d5d6482a27ff9' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless
Diffstat (limited to 'drivers/net/wireless/ath/ath9k/common.c')
-rw-r--r-- | drivers/net/wireless/ath/ath9k/common.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/net/wireless/ath/ath9k/common.c b/drivers/net/wireless/ath/ath9k/common.c index eb62c58..e8c6994 100644 --- a/drivers/net/wireless/ath/ath9k/common.c +++ b/drivers/net/wireless/ath/ath9k/common.c @@ -368,11 +368,11 @@ void ath9k_cmn_update_txpow(struct ath_hw *ah, u16 cur_txpow, { struct ath_regulatory *reg = ath9k_hw_regulatory(ah); - if (reg->power_limit != new_txpow) { + if (reg->power_limit != new_txpow) ath9k_hw_set_txpowerlimit(ah, new_txpow, false); - /* read back in case value is clamped */ - *txpower = reg->max_power_level; - } + + /* read back in case value is clamped */ + *txpower = reg->max_power_level; } EXPORT_SYMBOL(ath9k_cmn_update_txpow); |