Skip to content

Commit

Permalink
wlcore: always clear recovery flag during recovery_work
Browse files Browse the repository at this point in the history
If recovery is called when the FW is off, we should clear the recovery
flag. Otherwise we risk booting the driver in permanent pending-recovery
state.

Signed-off-by: Arik Nemtsov <arik@wizery.com>
Signed-off-by: Luciano Coelho <coelho@ti.com>
  • Loading branch information
Arik Nemtsov authored and John W. Linville committed Jul 10, 2012
1 parent aafec11 commit b034fd6
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions drivers/net/wireless/ti/wlcore/main.c
Original file line number Diff line number Diff line change
Expand Up @@ -926,7 +926,6 @@ static void wl1271_recovery_work(struct work_struct *work)

if (no_recovery) {
wl1271_info("No recovery (chosen on module load). Fw will remain stuck.");
clear_bit(WL1271_FLAG_RECOVERY_IN_PROGRESS, &wl->flags);
goto out_unlock;
}

Expand Down Expand Up @@ -970,7 +969,8 @@ static void wl1271_recovery_work(struct work_struct *work)
wlcore_wake_queues(wl, WLCORE_QUEUE_STOP_REASON_FW_RESTART);
return;
out_unlock:
wl->watchdog_recovery = false;
wl->watchdog_recovery = false;
clear_bit(WL1271_FLAG_RECOVERY_IN_PROGRESS, &wl->flags);
mutex_unlock(&wl->mutex);
}

Expand Down

0 comments on commit b034fd6

Please sign in to comment.