diff --git a/[refs] b/[refs]
index a6285b2890da..cd16d43e8abc 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 0e41f715c04f85a40ae6531d660be2241717be1c
+refs/heads/master: d5edaedc16ebd0635435dec068d49e07a76ba7d9
diff --git a/trunk/net/mac80211/mlme.c b/trunk/net/mac80211/mlme.c
index 3610c11286bc..2029b71eb879 100644
--- a/trunk/net/mac80211/mlme.c
+++ b/trunk/net/mac80211/mlme.c
@@ -487,6 +487,13 @@ static void ieee80211_enable_ps(struct ieee80211_local *local,
 {
 	struct ieee80211_conf *conf = &local->hw.conf;
 
+	/*
+	 * If we are scanning right now then the parameters will
+	 * take effect when scan finishes.
+	 */
+	if (local->hw_scanning || local->sw_scanning)
+		return;
+
 	if (conf->dynamic_ps_timeout > 0 &&
 	    !(local->hw.flags & IEEE80211_HW_SUPPORTS_DYNAMIC_PS)) {
 		mod_timer(&local->dynamic_ps_timer, jiffies +