aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--drivers/net/wireless/ti/wlcore/main.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/net/wireless/ti/wlcore/main.c b/drivers/net/wireless/ti/wlcore/main.c
index 7b825e8c1a9b..3f5d87e95d92 100644
--- a/drivers/net/wireless/ti/wlcore/main.c
+++ b/drivers/net/wireless/ti/wlcore/main.c
@@ -775,8 +775,9 @@ void wl12xx_queue_recovery_work(struct wl1271 *wl)
775 WARN_ON(!test_bit(WL1271_FLAG_INTENDED_FW_RECOVERY, &wl->flags)); 775 WARN_ON(!test_bit(WL1271_FLAG_INTENDED_FW_RECOVERY, &wl->flags));
776 776
777 /* Avoid a recursive recovery */ 777 /* Avoid a recursive recovery */
778 if (!test_and_set_bit(WL1271_FLAG_RECOVERY_IN_PROGRESS, &wl->flags)) { 778 if (wl->state == WLCORE_STATE_ON) {
779 wl->state = WLCORE_STATE_RESTARTING; 779 wl->state = WLCORE_STATE_RESTARTING;
780 set_bit(WL1271_FLAG_RECOVERY_IN_PROGRESS, &wl->flags);
780 wlcore_disable_interrupts_nosync(wl); 781 wlcore_disable_interrupts_nosync(wl);
781 ieee80211_queue_work(wl->hw, &wl->recovery_work); 782 ieee80211_queue_work(wl->hw, &wl->recovery_work);
782 } 783 }