diff options
| author | Rajkumar Manoharan <rmanohar@qca.qualcomm.com> | 2012-10-25 07:46:53 -0400 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2012-10-29 15:30:33 -0400 |
| commit | cdbe408da76d5cc294edb013850cc3a972d80968 (patch) | |
| tree | 6f78925884ca140ad6879dfdeb96f66b55d756f7 | |
| parent | e75d4ed6a9565fcccd579316b0fd933d2191f513 (diff) | |
ath9k_hw: validate MCI stuck after RTC wakeup
Signed-off-by: Rajkumar Manoharan <rmanohar@qca.qualcomm.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
| -rw-r--r-- | drivers/net/wireless/ath/ath9k/hw.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/net/wireless/ath/ath9k/hw.c b/drivers/net/wireless/ath/ath9k/hw.c index 8e1559aba49..71cd9f0c96a 100644 --- a/drivers/net/wireless/ath/ath9k/hw.c +++ b/drivers/net/wireless/ath/ath9k/hw.c | |||
| @@ -2153,9 +2153,6 @@ static bool ath9k_hw_set_power_awake(struct ath_hw *ah) | |||
| 2153 | AR_RTC_FORCE_WAKE_EN); | 2153 | AR_RTC_FORCE_WAKE_EN); |
| 2154 | udelay(50); | 2154 | udelay(50); |
| 2155 | 2155 | ||
| 2156 | if (ath9k_hw_mci_is_enabled(ah)) | ||
| 2157 | ar9003_mci_set_power_awake(ah); | ||
| 2158 | |||
| 2159 | for (i = POWER_UP_TIME / 50; i > 0; i--) { | 2156 | for (i = POWER_UP_TIME / 50; i > 0; i--) { |
| 2160 | val = REG_READ(ah, AR_RTC_STATUS) & AR_RTC_STATUS_M; | 2157 | val = REG_READ(ah, AR_RTC_STATUS) & AR_RTC_STATUS_M; |
| 2161 | if (val == AR_RTC_STATUS_ON) | 2158 | if (val == AR_RTC_STATUS_ON) |
| @@ -2171,6 +2168,9 @@ static bool ath9k_hw_set_power_awake(struct ath_hw *ah) | |||
| 2171 | return false; | 2168 | return false; |
| 2172 | } | 2169 | } |
| 2173 | 2170 | ||
| 2171 | if (ath9k_hw_mci_is_enabled(ah)) | ||
| 2172 | ar9003_mci_set_power_awake(ah); | ||
| 2173 | |||
| 2174 | REG_CLR_BIT(ah, AR_STA_ID1, AR_STA_ID1_PWR_SAV); | 2174 | REG_CLR_BIT(ah, AR_STA_ID1, AR_STA_ID1_PWR_SAV); |
| 2175 | 2175 | ||
| 2176 | return true; | 2176 | return true; |