From e16fb19437e275e5c387c243257dfbdc1a6b9a1b Mon Sep 17 00:00:00 2001
From: Rajkumar Manoharan <rmanoharan@atheros.com>
Date: Sat, 15 Jan 2011 01:01:22 +0530
Subject: [PATCH] --- yaml --- r: 236735 b: refs/heads/master c:
 bdd196a3e00d2be8b50d8af0d8cf845884f4d59b h: refs/heads/master i:   236733:
 3b8c497558ed4d178e2ceb514d0b55bf1c5d01ff   236731:
 d1585f3e4010d296278bfcd99a3d469d779f3a9b   236727:
 c287e99849a533b17c0347cd66f42fef8b1bd520   236719:
 9aca693aa16bf72c7a6cae6449633c6eadf9b7e1   236703:
 d140271bf2027eb1540441b50dba24979be1bd37   236671:
 5655514a6102bb8308659f8be529a802bb2a4ff1 v: v3

---
 [refs]                                       | 2 +-
 trunk/drivers/net/wireless/ath/ath9k/calib.c | 5 ++---
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/[refs] b/[refs]
index 5b8178ec9bb0..a20ffc9d2661 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: bfc31df33b162540c6c3e1473e022cd0a312a522
+refs/heads/master: bdd196a3e00d2be8b50d8af0d8cf845884f4d59b
diff --git a/trunk/drivers/net/wireless/ath/ath9k/calib.c b/trunk/drivers/net/wireless/ath/ath9k/calib.c
index b68a1acbddd0..b4a92a4313f6 100644
--- a/trunk/drivers/net/wireless/ath/ath9k/calib.c
+++ b/trunk/drivers/net/wireless/ath/ath9k/calib.c
@@ -382,9 +382,8 @@ void ath9k_init_nfcal_hist_buffer(struct ath_hw *ah,
 	s16 default_nf;
 	int i, j;
 
-	if (!ah->caldata)
-		return;
-
+	ah->caldata->channel = chan->channel;
+	ah->caldata->channelFlags = chan->channelFlags & ~CHANNEL_CW_INT;
 	h = ah->caldata->nfCalHist;
 	default_nf = ath9k_hw_get_default_nf(ah, chan);
 	for (i = 0; i < NUM_NF_READINGS; i++) {