From 923bdbfbf0bf558df5264cea9222ed90716d2950 Mon Sep 17 00:00:00 2001 From: Vivek Natarajan Date: Thu, 17 Sep 2009 09:27:59 +0530 Subject: [PATCH] --- yaml --- r: 166289 b: refs/heads/master c: 42abfbee23bf86e2c74d569b7ddd040d29782c5a h: refs/heads/master i: 166287: cc721992a24ffadc9bd25a0fa4e8a5b4a91be029 v: v3 --- [refs] | 2 +- trunk/drivers/net/wireless/ath/ath9k/hw.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 282778543f29..adb79c15310b 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: ce143bb04491a586ec95798711dee7fd43fbe042 +refs/heads/master: 42abfbee23bf86e2c74d569b7ddd040d29782c5a diff --git a/trunk/drivers/net/wireless/ath/ath9k/hw.c b/trunk/drivers/net/wireless/ath/ath9k/hw.c index 323df96dad0b..814682618b84 100644 --- a/trunk/drivers/net/wireless/ath/ath9k/hw.c +++ b/trunk/drivers/net/wireless/ath/ath9k/hw.c @@ -1793,7 +1793,7 @@ static void ath9k_hw_set_regs(struct ath_hw *ah, struct ath9k_channel *chan, static bool ath9k_hw_chip_reset(struct ath_hw *ah, struct ath9k_channel *chan) { - if (OLC_FOR_AR9280_20_LATER) { + 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))