diff options
| author | Kevin Hilman <khilman@linaro.org> | 2015-08-14 10:33:21 -0700 |
|---|---|---|
| committer | Kevin Hilman <khilman@linaro.org> | 2015-08-14 10:33:21 -0700 |
| commit | 59255ac55ba6ecd195ef97c6bcd1303a7f838c94 (patch) | |
| tree | c21899d772e8b55b74c9943f48ae88d3bd8724c9 /drivers/net/wireless/ath/ath9k/main.c | |
| parent | 9106e24eb8e4dbe7f8de197317e68624ada540b0 (diff) | |
| parent | 07818b5b1ba0f494a7255ab634bad2dd2b908ed0 (diff) | |
Merge branch 'linux-linaro-lsk-v3.10' into linux-linaro-lsk-v3.10-rtlsk-v3.10-15.08-rt
Diffstat (limited to 'drivers/net/wireless/ath/ath9k/main.c')
| -rw-r--r-- | drivers/net/wireless/ath/ath9k/main.c | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/drivers/net/wireless/ath/ath9k/main.c b/drivers/net/wireless/ath/ath9k/main.c index 82a1b5b16b62..c7f23d271058 100644 --- a/drivers/net/wireless/ath/ath9k/main.c +++ b/drivers/net/wireless/ath/ath9k/main.c @@ -195,11 +195,13 @@ static bool ath_prepare_reset(struct ath_softc *sc) ath9k_debug_samp_bb_mac(sc); ath9k_hw_disable_interrupts(ah); - if (!ath_drain_all_txq(sc)) - ret = false; - - if (!ath_stoprecv(sc)) - ret = false; + if (AR_SREV_9300_20_OR_LATER(ah)) { + ret &= ath_stoprecv(sc); + ret &= ath_drain_all_txq(sc); + } else { + ret &= ath_drain_all_txq(sc); + ret &= ath_stoprecv(sc); + } return ret; } |