diff --git a/[refs] b/[refs]
index 480f0e94390e..d7ab3b2c81b1 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 64bd0821a3b66c3307d7a4ee5523e3e35ec2df0e
+refs/heads/master: a331400bf01231253a0d9ab211c83212d2ac4edb
diff --git a/trunk/net/mac80211/mlme.c b/trunk/net/mac80211/mlme.c
index 746595597b68..456cccf26b51 100644
--- a/trunk/net/mac80211/mlme.c
+++ b/trunk/net/mac80211/mlme.c
@@ -1095,6 +1095,7 @@ static void ieee80211_set_disassoc(struct ieee80211_sub_if_data *sdata,
 		local->hw.conf.flags &= ~IEEE80211_CONF_PS;
 		config_changed |= IEEE80211_CONF_CHANGE_PS;
 	}
+	local->ps_sdata = NULL;
 
 	ieee80211_hw_config(local, config_changed);