commit b4a732abd60a277ebc3f7af0509501e74d6015e0
author Allan Zhang <allanzhang@google.com> Fri Aug 28 17:26:27 2015 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Fri Aug 28 17:26:27 2015 +0000
tree ec0ebe9839421b7b3a588ed1f544f485a84068bc
parent 5033527839672e9e5e5f0a6143c746236da78751
parent eebc1617cf1f0d41638a91e864730d5dd613efe1

Merge "ath9k: fix DMA stop sequence for AR9003+"

drivers/net/wireless/ath/ath9k/main.c

diff --git a/drivers/net/wireless/ath/ath9k/main.c b/drivers/net/wireless/ath/ath9k/main.c
index 8c56ecd..4ec31a3 100644
--- a/drivers/net/wireless/ath/ath9k/main.c
+++ b/drivers/net/wireless/ath/ath9k/main.c
@@ -216,11 +216,13 @@
 	ath_stop_ani(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;
 }