---

yaml --- r: 314362 b: refs/heads/master c: ed6ebd8 h: refs/heads/master v: v3
git-mirror · Jun 13, 2012 · 1c3779f · 1c3779f
1 parent 0b1d2c9
commit 1c3779f
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 1bde95fa7ed84094d0606d9e79356a9dd8d0e01b
+refs/heads/master: ed6ebd8bc852845e34e8160eed43b29236b1892f
diff --git a/trunk/drivers/net/wireless/ath/ath9k/hw.c b/trunk/drivers/net/wireless/ath/ath9k/hw.c
@@ -1915,7 +1915,8 @@ int ath9k_hw_reset(struct ath_hw *ah, struct ath9k_channel *chan,
 
 	ath9k_hw_set_dma(ah);
 
-	REG_WRITE(ah, AR_OBS, 8);
+	if (!ath9k_hw_mci_is_enabled(ah))
+		REG_WRITE(ah, AR_OBS, 8);
 
 	if (ah->config.rx_intr_mitigation) {
 		REG_RMW_FIELD(ah, AR_RIMT, AR_RIMT_LAST, 500);