From b5d9c4b11317f6a9021ced6e9d7c741baae9878d Mon Sep 17 00:00:00 2001
From: "Luis R. Rodriguez" <lrodriguez@atheros.com>
Date: Sat, 12 Jun 2010 00:33:41 -0400
Subject: [PATCH] --- yaml --- r: 203021 b: refs/heads/master c:
 6e97f0fb4dc8e95cd7507f3ae89841a79bac0193 h: refs/heads/master i:   203019:
 44ab59ec75aa91fefbca9104740b8f18d7effb0b v: v3

---
 [refs]                                     | 2 +-
 trunk/drivers/net/wireless/ath/ath9k/ani.c | 9 ++++++++-
 2 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index e4d84e231774..1058f3939748 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 37e5bf6535a4d697fb9fa6f268a8354a612cbc00
+refs/heads/master: 6e97f0fb4dc8e95cd7507f3ae89841a79bac0193
diff --git a/trunk/drivers/net/wireless/ath/ath9k/ani.c b/trunk/drivers/net/wireless/ath/ath9k/ani.c
index e879055c058f..66d0b8846a0e 100644
--- a/trunk/drivers/net/wireless/ath/ath9k/ani.c
+++ b/trunk/drivers/net/wireless/ath/ath9k/ani.c
@@ -585,8 +585,15 @@ void ath9k_hw_procmibevent(struct ath_hw *ah)
 	/* Clear the mib counters and save them in the stats */
 	ath9k_hw_update_mibstats(ah, &ah->ah_mibStats);
 
-	if (!DO_ANI(ah))
+	if (!DO_ANI(ah)) {
+		/*
+		 * We must always clear the interrupt cause by
+		 * resetting the phy error regs.
+		 */
+		REG_WRITE(ah, AR_PHY_ERR_1, 0);
+		REG_WRITE(ah, AR_PHY_ERR_2, 0);
 		return;
+	}
 
 	/* NB: these are not reset-on-read */
 	phyCnt1 = REG_READ(ah, AR_PHY_ERR_1);