diff --git a/[refs] b/[refs]
index f9c475760f75..74661f0312db 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 5a3a0352f39c81dfa5c30a190ad04d115616c3e6
+refs/heads/master: 8c7914dec29f39a6a8ca348a5eeace40a59be65d
diff --git a/trunk/net/mac80211/mlme.c b/trunk/net/mac80211/mlme.c
index 32210695b8b6..dfa752e5520b 100644
--- a/trunk/net/mac80211/mlme.c
+++ b/trunk/net/mac80211/mlme.c
@@ -601,6 +601,14 @@ void ieee80211_recalc_ps(struct ieee80211_local *local, s32 latency)
 	list_for_each_entry(sdata, &local->interfaces, list) {
 		if (!ieee80211_sdata_running(sdata))
 			continue;
+		if (sdata->vif.type == NL80211_IFTYPE_AP) {
+			/* If an AP vif is found, then disable PS
+			 * by setting the count to zero thereby setting
+			 * ps_sdata to NULL.
+			 */
+			count = 0;
+			break;
+		}
 		if (sdata->vif.type != NL80211_IFTYPE_STATION)
 			continue;
 		found = sdata;