Skip to content

Commit

Permalink
at76c50x-usb: cancel scan work at stop callback
Browse files Browse the repository at this point in the history
This should fix suspend as mac80211 expects all work queued
to the mac80211 workqueue to be canceled at driver stop().

Signed-off-by: Luis R. Rodriguez <lrodriguez@atheros.com>
Acked-by: Kalle Valo <kalle.valo@iki.fi>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
  • Loading branch information
Luis R. Rodriguez authored and John W. Linville committed Aug 4, 2009
1 parent ebc8ab1 commit 9ed21d3
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion drivers/net/wireless/at76c50x-usb.c
Original file line number Diff line number Diff line change
Expand Up @@ -1773,6 +1773,7 @@ static void at76_mac80211_stop(struct ieee80211_hw *hw)

at76_dbg(DBG_MAC80211, "%s()", __func__);

cancel_delayed_work(&priv->dwork_hw_scan);
cancel_work_sync(&priv->work_set_promisc);

mutex_lock(&priv->mtx);
Expand Down Expand Up @@ -2298,7 +2299,6 @@ static void at76_delete_device(struct at76_priv *priv)
tasklet_kill(&priv->rx_tasklet);

if (priv->mac80211_registered) {
cancel_delayed_work(&priv->dwork_hw_scan);
flush_workqueue(priv->hw->workqueue);
ieee80211_unregister_hw(priv->hw);
}
Expand Down

0 comments on commit 9ed21d3

Please sign in to comment.