---

yaml
---
r: 150415
b: refs/heads/master
c: 1ffc1c6
h: refs/heads/master
i:
  150413: 5fc4081
  150411: 66c7ee9
  150407: 9efd1ef
  150399: 18e263d
v: v3

[refs]

@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 9a23f9ca50943c1b4535d22b3acda3c31b4ad072
+refs/heads/master: 1ffc1c61bdbe31105d99d65043bbf7ae6d24dbc7

trunk/drivers/net/wireless/ath/ath9k/main.c

@@ -329,6 +329,12 @@ static void ath_ani_calibrate(unsigned long data)
 	if (sc->sc_flags & SC_OP_SCANNING)
 		goto set_timer;
 
+	/* Only calibrate if awake */
+	if (sc->sc_ah->power_mode != ATH9K_PM_AWAKE)
+		goto set_timer;
+
+	ath9k_ps_wakeup(sc);
+
 	/* Long calibration runs independently of short calibration. */
 	if ((timestamp - sc->ani.longcal_timer) >= ATH_LONG_CALINTERVAL) {
 		longcal = true;
@@ -380,6 +386,8 @@ static void ath_ani_calibrate(unsigned long data)
 		}
 	}
 
+	ath9k_ps_restore(sc);
+
 set_timer:
 	/*
 	* Set timer interval based on previous results.