---

yaml --- r: 231196 b: refs/heads/master c: 6d50192 h: refs/heads/master v: v3
git-mirror · Jan 10, 2011 · 7d6a2a8 · 7d6a2a8
1 parent 96df59d
commit 7d6a2a8
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 69bdacc8fbac32e4dc804ab13cafe3c1bbdcba9d
+refs/heads/master: 6d50192c17d4481c0e34c1ed2ae24fd7bc16e121
diff --git a/trunk/drivers/net/wireless/ath/ath9k/hw.c b/trunk/drivers/net/wireless/ath/ath9k/hw.c
@@ -1214,7 +1214,7 @@ int ath9k_hw_reset(struct ath_hw *ah, struct ath9k_channel *chan,
 	ah->txchainmask = common->tx_chainmask;
 	ah->rxchainmask = common->rx_chainmask;
 
-	if (!ah->chip_fullsleep) {
+	if ((common->bus_ops->ath_bus_type != ATH_USB) && !ah->chip_fullsleep) {
 		ath9k_hw_abortpcurecv(ah);
 		if (!ath9k_hw_stopdmarecv(ah)) {
 			ath_dbg(common, ATH_DBG_XMIT,