2011-08-29 12:01:06 +00:00
|
|
|
--- a/drivers/net/wireless/ath/ath9k/hw.c
|
|
|
|
|
+++ b/drivers/net/wireless/ath/ath9k/hw.c
|
2011-08-31 06:34:53 +00:00
|
|
|
@@ -1371,10 +1371,16 @@ static bool ath9k_hw_set_reset_reg(struc
|
2011-08-29 12:01:06 +00:00
|
|
|
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))
|
