|
@@ -680,8 +680,8 @@ static void ath10k_core_restart(struct work_struct *work)
|
|
|
|
|
|
switch (ar->state) {
|
|
|
case ATH10K_STATE_ON:
|
|
|
- ath10k_halt(ar);
|
|
|
ar->state = ATH10K_STATE_RESTARTING;
|
|
|
+ ath10k_halt(ar);
|
|
|
ieee80211_restart_hw(ar->hw);
|
|
|
break;
|
|
|
case ATH10K_STATE_OFF:
|
|
@@ -908,7 +908,9 @@ void ath10k_core_stop(struct ath10k *ar)
|
|
|
lockdep_assert_held(&ar->conf_mutex);
|
|
|
|
|
|
/* try to suspend target */
|
|
|
- ath10k_wait_for_suspend(ar, WMI_PDEV_SUSPEND_AND_DISABLE_INTR);
|
|
|
+ if (ar->state != ATH10K_STATE_RESTARTING)
|
|
|
+ ath10k_wait_for_suspend(ar, WMI_PDEV_SUSPEND_AND_DISABLE_INTR);
|
|
|
+
|
|
|
ath10k_debug_stop(ar);
|
|
|
ath10k_htc_stop(&ar->htc);
|
|
|
ath10k_htt_detach(&ar->htt);
|