diff --git a/[refs] b/[refs]
index 61021d2539e3..a82bc05e479a 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 30d3ef41b4395d9bee5f481395eef2d3b8b6ee50
+refs/heads/master: e874e6585539f6706b8e5f96125c9fca89cce716
diff --git a/trunk/net/mac80211/pm.c b/trunk/net/mac80211/pm.c
index 6d17ed7fd49b..44525f517077 100644
--- a/trunk/net/mac80211/pm.c
+++ b/trunk/net/mac80211/pm.c
@@ -44,6 +44,9 @@ int __ieee80211_suspend(struct ieee80211_hw *hw)
 		}
 	}
 
+	/* flush again, in case driver queued work */
+	flush_workqueue(local->hw.workqueue);
+
 	/* stop hardware */
 	if (local->open_count) {
 		ieee80211_led_radio(local, false);