From b02ef57b5a502d7c78582347e1f2e73d779c1f66 Mon Sep 17 00:00:00 2001
From: Johannes Berg <johannes.berg@intel.com>
Date: Wed, 25 Aug 2010 14:47:38 +0200
Subject: [PATCH] --- yaml --- r: 210253 b: refs/heads/master c:
 071249b1d501b1f31a6b1af3fbcbe03158a84e5c h: refs/heads/master i:   210251:
 d7a36ddff9d179f90b05226be694cd99424493a7 v: v3

---
 [refs]                    | 2 +-
 trunk/net/mac80211/main.c | 6 ++++++
 2 files changed, 7 insertions(+), 1 deletion(-)

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);