git.samba.org
/
sfrench
/
cifs-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge ath-next from git://git.kernel.org/pub/scm/linux/kernel/git/kvalo/ath.git
[sfrench/cifs-2.6.git]
/
drivers
/
net
/
wireless
/
ath
/
ath9k
/
common.c
diff --git
a/drivers/net/wireless/ath/ath9k/common.c
b/drivers/net/wireless/ath/ath9k/common.c
index c67d0e08bd4c2bbeed447976ff05dbaf66547b54..099f3d45c594d7bbe7c56aad7503627bd37d20d1 100644
(file)
--- 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);
{
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 */
ath9k_hw_set_txpowerlimit(ah, new_txpow, false);
/* read back in case value is clamped */