From 72d6c83e87b86325a1f1dd1dd6773a1e7a625d5b Mon Sep 17 00:00:00 2001
From: Adrian Chadd <adrian.chadd@gmail.com>
Date: Fri, 27 May 2011 01:08:04 +0800
Subject: [PATCH] --- yaml --- r: 253044 b: refs/heads/master c:
 1df85ecec36ad5da3f0165760704310d6c03f65f h: refs/heads/master v: v3

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

diff --git a/[refs] b/[refs]
index 2b4e95e3e9bb..23d4f1047bc1 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 64c754ed3b0009e4fa248f739000dc234eb0d2c9
+refs/heads/master: 1df85ecec36ad5da3f0165760704310d6c03f65f
diff --git a/trunk/drivers/net/wireless/ath/ath9k/ar9002_calib.c b/trunk/drivers/net/wireless/ath/ath9k/ar9002_calib.c
index 015d97439935..2d4c0910295b 100644
--- a/trunk/drivers/net/wireless/ath/ath9k/ar9002_calib.c
+++ b/trunk/drivers/net/wireless/ath/ath9k/ar9002_calib.c
@@ -829,7 +829,7 @@ static bool ar9002_hw_init_cal(struct ath_hw *ah, struct ath9k_channel *chan)
 	if (AR_SREV_9271(ah)) {
 		if (!ar9285_hw_cl_cal(ah, chan))
 			return false;
-	} else if (AR_SREV_9285_12_OR_LATER(ah)) {
+	} else if (AR_SREV_9285(ah) && AR_SREV_9285_12_OR_LATER(ah)) {
 		if (!ar9285_hw_clc(ah, chan))
 			return false;
 	} else {