diff options
| author | Kalle Valo <kvalo@codeaurora.org> | 2017-05-19 11:47:44 +0300 |
|---|---|---|
| committer | Kalle Valo <kvalo@codeaurora.org> | 2017-05-19 11:47:44 +0300 |
| commit | fb53905cf2c3db6eb1ce37a37c5002456fa7ee20 (patch) | |
| tree | 52c6f0bc2987803a10732a2acb772882d4189eb6 /drivers/net/wireless/ath/ath9k | |
| parent | a1ad7198202ff9a2436bd24437730e78d90c5271 (diff) | |
| parent | b01c9e327249e4995e5b5b6cebec14166db9c1e7 (diff) | |
| download | linux-fb53905cf2c3db6eb1ce37a37c5002456fa7ee20.tar.gz linux-fb53905cf2c3db6eb1ce37a37c5002456fa7ee20.tar.bz2 linux-fb53905cf2c3db6eb1ce37a37c5002456fa7ee20.zip | |
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')
| -rw-r--r-- | drivers/net/wireless/ath/ath9k/common.c | 2 | ||||
| -rw-r--r-- | drivers/net/wireless/ath/ath9k/eeprom.c | 2 | ||||
| -rw-r--r-- | drivers/net/wireless/ath/ath9k/tx99.c | 2 |
3 files changed, 3 insertions, 3 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 */ diff --git a/drivers/net/wireless/ath/ath9k/eeprom.c b/drivers/net/wireless/ath/ath9k/eeprom.c index 6ccf24814514..6fbd5559c0c0 100644 --- a/drivers/net/wireless/ath/ath9k/eeprom.c +++ b/drivers/net/wireless/ath/ath9k/eeprom.c @@ -143,7 +143,7 @@ bool ath9k_hw_nvram_read(struct ath_hw *ah, u32 off, u16 *data) if (ah->eeprom_blob) ret = ath9k_hw_nvram_read_firmware(ah->eeprom_blob, off, data); - else if (pdata && !pdata->use_eeprom && pdata->eeprom_data) + else if (pdata && !pdata->use_eeprom) ret = ath9k_hw_nvram_read_pdata(pdata, off, data); else ret = common->bus_ops->eeprom_read(common, off, data); diff --git a/drivers/net/wireless/ath/ath9k/tx99.c b/drivers/net/wireless/ath/ath9k/tx99.c index 16aca9e28b77..a866cbda0799 100644 --- a/drivers/net/wireless/ath/ath9k/tx99.c +++ b/drivers/net/wireless/ath/ath9k/tx99.c @@ -153,7 +153,7 @@ static int ath9k_tx99_init(struct ath_softc *sc) sc->tx99_power, sc->tx99_power / 2); - /* We leave the harware awake as it will be chugging on */ + /* We leave the hardware awake as it will be chugging on */ return 0; } |