---

yaml --- r: 225143 b: refs/heads/master c: ff9f0b6 h: refs/heads/master i: 225141: 2836d79 225139: 0640e9b 225135: 7243018 v: v3
git-mirror · Dec 8, 2010 · c253605 · c253605
1 parent 815e559
commit c253605
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git 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
@@ -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);