diff --git a/[refs] b/[refs]
index d959ae4f7797..483637a945ee 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: f880c2050f30b23c9b6f80028c09f76e693bf309
+refs/heads/master: 071249b1d501b1f31a6b1af3fbcbe03158a84e5c
diff --git a/trunk/net/mac80211/main.c b/trunk/net/mac80211/main.c
index 798a91b100cc..ded5c3843e06 100644
--- a/trunk/net/mac80211/main.c
+++ b/trunk/net/mac80211/main.c
@@ -732,6 +732,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->reconfig_filter);
 
 	ieee80211_clear_tx_pending(local);