---

yaml --- r: 360809 b: refs/heads/master c: 3412f2f h: refs/heads/master i: 360807: eccfab6 v: v3
git-mirror · Feb 27, 2013 · a0fd3cb · a0fd3cb
1 parent 60f2e4c
commit a0fd3cb
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: f45dd363bee071a62e32398a0ae4a0214b8029eb
+refs/heads/master: 3412f2f086ea7531378fabe756bd4a1109994ae6
diff --git a/trunk/drivers/net/wireless/ath/ath9k/hw.c b/trunk/drivers/net/wireless/ath/ath9k/hw.c
@@ -1463,7 +1463,9 @@ static bool ath9k_hw_chip_reset(struct ath_hw *ah,
 			reset_type = ATH9K_RESET_POWER_ON;
 		else
 			reset_type = ATH9K_RESET_COLD;
-	}
+	} else if (ah->chip_fullsleep || REG_READ(ah, AR_Q_TXE) ||
+		   (REG_READ(ah, AR_CR) & AR_CR_RXE))
+		reset_type = ATH9K_RESET_COLD;
 
 	if (!ath9k_hw_set_reset_reg(ah, reset_type))
 		return false;