Skip to content

Commit

Permalink
wl12xx: cancel delayed elp work and clear flags when stopping PLT
Browse files Browse the repository at this point in the history
In some cases a race condition can happen if we don't cancel any
pending ELP work before stopping PLT.  With this commit we cancel ELP
work and clear the wl->flags bitmask.  Also clean up the wl elements
after powering off.

Signed-off-by: Luciano Coelho <coelho@ti.com>
  • Loading branch information
Luciano Coelho committed Feb 15, 2012
1 parent 46b0cc9 commit f6fbecc
Showing 1 changed file with 4 additions and 3 deletions.
7 changes: 4 additions & 3 deletions drivers/net/wireless/wl12xx/main.c
Original file line number Diff line number Diff line change
Expand Up @@ -1420,17 +1420,18 @@ int wl1271_plt_stop(struct wl1271 *wl)
goto out;
}

wl->state = WL1271_STATE_OFF;
wl->rx_counter = 0;

mutex_unlock(&wl->mutex);

wl1271_flush_deferred_work(wl);
cancel_work_sync(&wl->netstack_work);
cancel_work_sync(&wl->recovery_work);
cancel_delayed_work_sync(&wl->elp_work);

mutex_lock(&wl->mutex);
wl1271_power_off(wl);
wl->flags = 0;
wl->state = WL1271_STATE_OFF;
wl->rx_counter = 0;
mutex_unlock(&wl->mutex);

out:
Expand Down

0 comments on commit f6fbecc

Please sign in to comment.