diff --git a/[refs] b/[refs]
index 31f6ba1ba0fa..ed233c6cc139 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 5e124bd5e00fcf54df555b368c2dafe6886f1df2
+refs/heads/master: 678f415fdc534c0a806fce992e4c62df0eff19d2
diff --git a/trunk/net/mac80211/util.c b/trunk/net/mac80211/util.c
index 72a98e844718..a2ba6e29bd9a 100644
--- a/trunk/net/mac80211/util.c
+++ b/trunk/net/mac80211/util.c
@@ -1069,9 +1069,9 @@ void ieee80211_stop_device(struct ieee80211_local *local)
 	ieee80211_led_radio(local, false);
 
 	cancel_work_sync(&local->reconfig_filter);
-	drv_stop(local);
 
 	flush_workqueue(local->workqueue);
+	drv_stop(local);
 }
 
 int ieee80211_reconfig(struct ieee80211_local *local)