From 32c6836883a902d55b96d59051c19629fa8b9bec Mon Sep 17 00:00:00 2001
From: Jouni Malinen <jouni.malinen@atheros.com>
Date: Tue, 19 May 2009 17:01:39 +0300
Subject: [PATCH] --- yaml --- r: 150415 b: refs/heads/master c:
 1ffc1c61bdbe31105d99d65043bbf7ae6d24dbc7 h: refs/heads/master i:   150413:
 5fc40815d94abc85b38a460ade9d0a342c4eac1b   150411:
 66c7ee9c7e82670d964ebdb0e2a6e310e52a12b0   150407:
 9efd1ef763c2b8c6bb6ac6eb9e3960769d6ef15e   150399:
 18e263d76f50c650b5ec5b3c8cb1233f6a730a4e v: v3

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

diff --git a/[refs] b/[refs]
index 1058e2a004c2..75f2724988fc 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 9a23f9ca50943c1b4535d22b3acda3c31b4ad072
+refs/heads/master: 1ffc1c61bdbe31105d99d65043bbf7ae6d24dbc7
diff --git a/trunk/drivers/net/wireless/ath/ath9k/main.c b/trunk/drivers/net/wireless/ath/ath9k/main.c
index 7c3a98b1957d..dd54fa727a61 100644
--- a/trunk/drivers/net/wireless/ath/ath9k/main.c
+++ b/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.