diff options
| author | Kalle Valo <kvalo@codeaurora.org> | 2016-06-19 11:19:30 +0300 |
|---|---|---|
| committer | Kalle Valo <kvalo@codeaurora.org> | 2016-06-19 11:19:30 +0300 |
| commit | 1bb57c8a5e33bcbec031ce0c629968922d5af89d (patch) | |
| tree | 4c5039784c5e276a0f5a2af779d3491dc395fadc /drivers/net/wireless/ath/ath9k | |
| parent | 2095b1426c9c8088f7be28d70c6d7eb432640baa (diff) | |
| parent | eb57a5b387d66be1f192a99b3707804e7f63715c (diff) | |
| download | op-kernel-dev-1bb57c8a5e33bcbec031ce0c629968922d5af89d.zip op-kernel-dev-1bb57c8a5e33bcbec031ce0c629968922d5af89d.tar.gz | |
Merge ath-next from ath.git
ath.git patches for 4.8. Major changes:
ath10k
* enable btcoex support without restarting firmware
* enable ipq4019 support using AHB bus
* add QCA9887 chipset support
* retrieve calibration data from EEPROM, currently only for QCA9887
wil6210
* add pm_notify handling
Diffstat (limited to 'drivers/net/wireless/ath/ath9k')
| -rw-r--r-- | drivers/net/wireless/ath/ath9k/ar9003_eeprom.c | 3 | ||||
| -rw-r--r-- | drivers/net/wireless/ath/ath9k/tx99.c | 3 |
2 files changed, 2 insertions, 4 deletions
diff --git a/drivers/net/wireless/ath/ath9k/ar9003_eeprom.c b/drivers/net/wireless/ath/ath9k/ar9003_eeprom.c index dec1a31..d0224fc 100644 --- a/drivers/net/wireless/ath/ath9k/ar9003_eeprom.c +++ b/drivers/net/wireless/ath/ath9k/ar9003_eeprom.c @@ -3202,8 +3202,7 @@ static int ar9300_compress_decision(struct ath_hw *ah, it, length); break; case _CompressBlock: - if (reference == 0) { - } else { + if (reference != 0) { eep = ar9003_eeprom_struct_find_by_id(reference); if (eep == NULL) { ath_dbg(common, EEPROM, diff --git a/drivers/net/wireless/ath/ath9k/tx99.c b/drivers/net/wireless/ath/ath9k/tx99.c index ac4781f..16aca9e 100644 --- a/drivers/net/wireless/ath/ath9k/tx99.c +++ b/drivers/net/wireless/ath/ath9k/tx99.c @@ -132,7 +132,6 @@ static int ath9k_tx99_init(struct ath_softc *sc) ath9k_ps_wakeup(sc); ath9k_hw_disable_interrupts(ah); - atomic_set(&ah->intr_ref_cnt, -1); ath_drain_all_txq(sc); ath_stoprecv(sc); @@ -266,7 +265,7 @@ static const struct file_operations fops_tx99_power = { void ath9k_tx99_init_debug(struct ath_softc *sc) { - if (!AR_SREV_9300_20_OR_LATER(sc->sc_ah)) + if (!AR_SREV_9280_20_OR_LATER(sc->sc_ah)) return; debugfs_create_file("tx99", S_IRUSR | S_IWUSR, |
