diff options
| author | Kalle Valo <kvalo@codeaurora.org> | 2017-06-28 22:10:48 +0300 |
|---|---|---|
| committer | Kalle Valo <kvalo@codeaurora.org> | 2017-06-28 22:10:48 +0300 |
| commit | fdcbe65d618af080ee23229f0137ffd37f2de36b (patch) | |
| tree | d94ef2e9b7eab0d1272df38dc0649d53163029fd /drivers/net/wireless/ath/ath9k/main.c | |
| parent | 3334c28ec56cfaa7c25931711eb2bda4a92d0712 (diff) | |
| parent | 6788a3832c706c541d8a8227076eddde47446c8a (diff) | |
| download | linux-fdcbe65d618af080ee23229f0137ffd37f2de36b.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:
Only bugfixes or cleanups, no new features.
Diffstat (limited to 'drivers/net/wireless/ath/ath9k/main.c')
| -rw-r--r-- | drivers/net/wireless/ath/ath9k/main.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/net/wireless/ath/ath9k/main.c b/drivers/net/wireless/ath/ath9k/main.c index 9e65d14e7b1e..8b4ac7f0a09b 100644 --- a/drivers/net/wireless/ath/ath9k/main.c +++ b/drivers/net/wireless/ath/ath9k/main.c @@ -731,12 +731,12 @@ static int ath9k_start(struct ieee80211_hw *hw) spin_unlock_bh(&sc->sc_pcu_lock); + ath9k_rng_start(sc); + mutex_unlock(&sc->mutex); ath9k_ps_restore(sc); - ath9k_rng_start(sc); - return 0; } @@ -826,10 +826,10 @@ static void ath9k_stop(struct ieee80211_hw *hw) ath9k_deinit_channel_context(sc); - ath9k_rng_stop(sc); - mutex_lock(&sc->mutex); + ath9k_rng_stop(sc); + ath_cancel_work(sc); if (test_bit(ATH_OP_INVALID, &common->op_flags)) { |