summaryrefslogtreecommitdiff
path: root/drivers/net/wireless/ath/ath9k/common.c
diff options
context:
space:
mode:
authorKalle Valo <kvalo@codeaurora.org>2017-05-19 11:47:44 +0300
committerKalle Valo <kvalo@codeaurora.org>2017-05-19 11:47:44 +0300
commitfb53905cf2c3db6eb1ce37a37c5002456fa7ee20 (patch)
tree52c6f0bc2987803a10732a2acb772882d4189eb6 /drivers/net/wireless/ath/ath9k/common.c
parenta1ad7198202ff9a2436bd24437730e78d90c5271 (diff)
parentb01c9e327249e4995e5b5b6cebec14166db9c1e7 (diff)
downloadlinux-fb53905cf2c3db6eb1ce37a37c5002456fa7ee20.tar.xz
Merge ath-next from git://git.kernel.org/pub/scm/linux/kernel/git/kvalo/ath.git
ath.git patches for 4.13. Major changes: ath10k * add initial SDIO support (still work in progress)
Diffstat (limited to 'drivers/net/wireless/ath/ath9k/common.c')
-rw-r--r--drivers/net/wireless/ath/ath9k/common.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/wireless/ath/ath9k/common.c b/drivers/net/wireless/ath/ath9k/common.c
index c67d0e08bd4c..099f3d45c594 100644
--- a/drivers/net/wireless/ath/ath9k/common.c
+++ b/drivers/net/wireless/ath/ath9k/common.c
@@ -369,7 +369,7 @@ 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 (ah->curchan && reg->power_limit != new_txpow)
ath9k_hw_set_txpowerlimit(ah, new_txpow, false);
/* read back in case value is clamped */