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>

diff --git a/drivers/net/wireless/at76c50x-usb.c b/drivers/net/wireless/at76c50x-usb.c
index bbf5277aeef41ded3742b0c20169bae3c560584a..f46e2b33b1f906ef22aca7d25a98ed6fb8d8250c 100644 (file)
--- 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)
 
        at76_dbg(DBG_MAC80211, "%s()", __func__);
 
+       cancel_delayed_work(&priv->dwork_hw_scan);
        cancel_work_sync(&priv->work_set_promisc);
 
        mutex_lock(&priv->mtx);
@@ -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);
        }