diff options
author | Luis R. Rodriguez <lrodriguez@atheros.com> | 2009-07-27 14:56:24 -0400 |
---|---|---|
committer | John W. Linville <linville@tuxdriver.com> | 2009-08-04 16:43:19 -0400 |
commit | 9ed21d390166ceb89e011d3dbd277475ff2f33c4 (patch) | |
tree | 13d7426c088823dcc9c75c5deac0fa08c667354e /drivers/net/wireless/at76c50x-usb.c | |
parent | ebc8ab17d69cbaec6bb345a48a2cb87047643f63 (diff) |
at76c50x-usb: cancel scan work at stop callback
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>
Diffstat (limited to 'drivers/net/wireless/at76c50x-usb.c')
-rw-r--r-- | drivers/net/wireless/at76c50x-usb.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/wireless/at76c50x-usb.c b/drivers/net/wireless/at76c50x-usb.c index bbf5277aeef4..f46e2b33b1f9 100644 --- a/drivers/net/wireless/at76c50x-usb.c +++ b/drivers/net/wireless/at76c50x-usb.c | |||
@@ -1773,6 +1773,7 @@ static void at76_mac80211_stop(struct ieee80211_hw *hw) | |||
1773 | 1773 | ||
1774 | at76_dbg(DBG_MAC80211, "%s()", __func__); | 1774 | at76_dbg(DBG_MAC80211, "%s()", __func__); |
1775 | 1775 | ||
1776 | cancel_delayed_work(&priv->dwork_hw_scan); | ||
1776 | cancel_work_sync(&priv->work_set_promisc); | 1777 | cancel_work_sync(&priv->work_set_promisc); |
1777 | 1778 | ||
1778 | mutex_lock(&priv->mtx); | 1779 | mutex_lock(&priv->mtx); |
@@ -2298,7 +2299,6 @@ static void at76_delete_device(struct at76_priv *priv) | |||
2298 | tasklet_kill(&priv->rx_tasklet); | 2299 | tasklet_kill(&priv->rx_tasklet); |
2299 | 2300 | ||
2300 | if (priv->mac80211_registered) { | 2301 | if (priv->mac80211_registered) { |
2301 | cancel_delayed_work(&priv->dwork_hw_scan); | ||
2302 | flush_workqueue(priv->hw->workqueue); | 2302 | flush_workqueue(priv->hw->workqueue); |
2303 | ieee80211_unregister_hw(priv->hw); | 2303 | ieee80211_unregister_hw(priv->hw); |
2304 | } | 2304 | } |