From 17c8d5b0954520a0e1c9182be7e9c3c536c2a46c Mon Sep 17 00:00:00 2001
From: Felix Fietkau <nbd@openwrt.org>
Date: Sat, 3 Mar 2012 15:17:02 +0100
Subject: [PATCH] --- yaml --- r: 291231 b: refs/heads/master c:
 9c083af8683808e486c20ca1f36da520d82e5981 h: refs/heads/master i:   291229:
 db9203d11abbb983a75a2f064f9f3730640a65b1   291227:
 29df1de60d0e9f8998daa58e916b65fde28aff88   291223:
 53e0465f1321db56c84255bbf3acc3352ee28e23   291215:
 d177afef2a6659fc95af74ed152ef74a651ad515   291199:
 669eebed844c0bdc191b6ff65e59674347415035 v: v3

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

diff --git a/[refs] b/[refs]
index 40d5d7b01b8e..5c6932895327 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: fcff4f108dce0692410f390a05565f4b1b84577f
+refs/heads/master: 9c083af8683808e486c20ca1f36da520d82e5981
diff --git a/trunk/drivers/net/wireless/ath/ath9k/hw.c b/trunk/drivers/net/wireless/ath/ath9k/hw.c
index 8c840cad3ac2..d582cf73098f 100644
--- a/trunk/drivers/net/wireless/ath/ath9k/hw.c
+++ b/trunk/drivers/net/wireless/ath/ath9k/hw.c
@@ -1386,10 +1386,16 @@ static bool ath9k_hw_set_reset_reg(struct ath_hw *ah, u32 type)
 static bool ath9k_hw_chip_reset(struct ath_hw *ah,
 				struct ath9k_channel *chan)
 {
-	if (AR_SREV_9280(ah) && ah->eep_ops->get_eeprom(ah, EEP_OL_PWRCTRL)) {
-		if (!ath9k_hw_set_reset_reg(ah, ATH9K_RESET_POWER_ON))
-			return false;
-	} else if (!ath9k_hw_set_reset_reg(ah, ATH9K_RESET_WARM))
+	int reset_type = ATH9K_RESET_WARM;
+
+	if (AR_SREV_9280(ah)) {
+		if (ah->eep_ops->get_eeprom(ah, EEP_OL_PWRCTRL))
+			reset_type = ATH9K_RESET_POWER_ON;
+		else
+			reset_type = ATH9K_RESET_COLD;
+	}
+
+	if (!ath9k_hw_set_reset_reg(ah, reset_type))
 		return false;
 
 	if (!ath9k_hw_setpower(ah, ATH9K_PM_AWAKE))