From c2536051d59e2fccacaf87cf910ae95d700e40a5 Mon Sep 17 00:00:00 2001
From: "Luis R. Rodriguez" <lrodriguez@atheros.com>
Date: Tue, 7 Dec 2010 15:13:22 -0800
Subject: [PATCH] --- yaml --- r: 225143 b: refs/heads/master c:
 ff9f0b639f33c92a89b0799263ab625444be6ee1 h: refs/heads/master i:   225141:
 2836d79cdc101b60f6cb34a228599faa4e1866b9   225139:
 0640e9b8c2684fcfd0889b89c22624e364072d29   225135:
 72430182d27c297762b8c2887625a061bc1ee929 v: v3

---
 [refs]                                      | 2 +-
 trunk/drivers/net/wireless/ath/ath9k/main.c | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 866a3d3f476b..d9a32c39b71f 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: b7e8941b2df518186d9f7679c007f6b619bb4e89
+refs/heads/master: ff9f0b639f33c92a89b0799263ab625444be6ee1
diff --git a/trunk/drivers/net/wireless/ath/ath9k/main.c b/trunk/drivers/net/wireless/ath/ath9k/main.c
index 3e0c8a1874b4..41a312a3d401 100644
--- a/trunk/drivers/net/wireless/ath/ath9k/main.c
+++ b/trunk/drivers/net/wireless/ath/ath9k/main.c
@@ -765,6 +765,8 @@ irqreturn_t ath_isr(int irq, void *dev)
 
 	if (!(ah->caps.hw_caps & ATH9K_HW_CAP_AUTOSLEEP))
 		if (status & ATH9K_INT_TIM_TIMER) {
+			if (ATH_DBG_WARN_ON_ONCE(sc->ps_idle))
+				goto chip_reset;
 			/* Clear RxAbort bit so that we can
 			 * receive frames */
 			ath9k_setpower(sc, ATH9K_PM_AWAKE);