1 files changed, 6 insertions, 0 deletions

diff --git a/drivers/net/wireless/at76c50x-usb.c b/drivers/net/wireless/at76c50x-usb.c
index 46ac9e278035..64d4192b5d52 100644
--- a/drivers/net/wireless/at76c50x-usb.c
+++ b/drivers/net/wireless/at76c50x-usb.c
@@ -1497,6 +1497,9 @@ static void at76_work_set_promisc(struct work_struct *work)
                                               work_set_promisc);
         int ret = 0;
 
+        if (priv->device_unplugged)
+                return;
+
         mutex_lock(&priv->mtx);
 
         priv->mib_buf.type = MIB_LOCAL;
@@ -2290,6 +2293,7 @@ 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);
         }
@@ -2307,6 +2311,8 @@ static void at76_delete_device(struct at76_priv *priv)
 
         kfree(priv->bulk_out_buffer);
 
+        del_timer_sync(&ledtrig_tx_timer);
+
         if (priv->rx_skb)
                 kfree_skb(priv->rx_skb);