diff --git a/[refs] b/[refs]
index 040a31461bb9..eac75d6db9dc 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 082e708acc50a5b625b9bde0bb1af90dfdbd1942
+refs/heads/master: 78f1a8b758d57c2d2c9f3db7199cd30803854c82
diff --git a/trunk/net/mac80211/mlme.c b/trunk/net/mac80211/mlme.c
index aca22b00b6a3..07e7e41816be 100644
--- a/trunk/net/mac80211/mlme.c
+++ b/trunk/net/mac80211/mlme.c
@@ -721,7 +721,7 @@ void ieee80211_dynamic_ps_timer(unsigned long data)
 {
 	struct ieee80211_local *local = (void *) data;
 
-	if (local->quiescing)
+	if (local->quiescing || local->suspended)
 		return;
 
 	queue_work(local->hw.workqueue, &local->dynamic_ps_enable_work);