Skip to content

Commit

Permalink
wl12xx: Cleanup PLT mode when module is removed
Browse files Browse the repository at this point in the history
PLT mode start/stop is controlled from userspace. When removing module, the
PLT mode state is however not checked, and not cleared. There is the possibility
of some unwanted state to left linger and there is even the possiblity of a
kernel crash if for instance IRQ work is running when the module is removed.

Fix this by stopping PLT mode on module removal, if still running.

Signed-off-by: Juuso Oikarinen <juuso.oikarinen@nokia.com>
Reviewed-by: Luciano Coelho <coelho@ti.com>
Signed-off-by: Luciano Coelho <coelho@ti.com>
  • Loading branch information
Juuso Oikarinen authored and Luciano Coelho committed Jan 24, 2011
1 parent 1d4801f commit 4ae3fa8
Showing 1 changed file with 15 additions and 5 deletions.
20 changes: 15 additions & 5 deletions drivers/net/wireless/wl12xx/main.c
Original file line number Diff line number Diff line change
Expand Up @@ -917,12 +917,10 @@ int wl1271_plt_start(struct wl1271 *wl)
return ret;
}

int wl1271_plt_stop(struct wl1271 *wl)
int __wl1271_plt_stop(struct wl1271 *wl)
{
int ret = 0;

mutex_lock(&wl->mutex);

wl1271_notice("power down");

if (wl->state != WL1271_STATE_PLT) {
Expand All @@ -938,12 +936,21 @@ int wl1271_plt_stop(struct wl1271 *wl)
wl->state = WL1271_STATE_OFF;
wl->rx_counter = 0;

out:
mutex_unlock(&wl->mutex);

cancel_work_sync(&wl->irq_work);
cancel_work_sync(&wl->recovery_work);
mutex_lock(&wl->mutex);
out:
return ret;
}

int wl1271_plt_stop(struct wl1271 *wl)
{
int ret;

mutex_lock(&wl->mutex);
ret = __wl1271_plt_stop(wl);
mutex_unlock(&wl->mutex);
return ret;
}

Expand Down Expand Up @@ -3109,6 +3116,9 @@ EXPORT_SYMBOL_GPL(wl1271_register_hw);

void wl1271_unregister_hw(struct wl1271 *wl)
{
if (wl->state == WL1271_STATE_PLT)
__wl1271_plt_stop(wl);

unregister_netdevice_notifier(&wl1271_dev_notifier);
ieee80211_unregister_hw(wl->hw);
wl->mac80211_registered = false;
Expand Down

0 comments on commit 4ae3fa8

Please sign in to comment.