1 files changed, 6 insertions, 0 deletions

diff --git a/net/mac80211/main.c b/net/mac80211/main.c
index 18fdeca43d98..7c8542627351 100644
--- a/net/mac80211/main.c
+++ b/net/mac80211/main.c
@@ -868,6 +868,12 @@ void ieee80211_unregister_hw(struct ieee80211_hw *hw)
 
         rtnl_unlock();
 
+        /*
+         * Now all work items will be gone, but the
+         * timer might still be armed, so delete it
+         */
+        del_timer_sync(&local->work_timer);
+
         cancel_work_sync(&local->restart_work);
         cancel_work_sync(&local->reconfig_filter);