diff --git a/[refs] b/[refs]
index 17f7b070335d..846cc9030358 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 8d2ef7bd76f222b068a3fd534fe5fdb8c9543ba0
+refs/heads/master: 9a547bf9a83ce7211d4290956d9fca8044a409de
diff --git a/trunk/drivers/net/wireless/wl12xx/wl1271_main.c b/trunk/drivers/net/wireless/wl12xx/wl1271_main.c
index 366e41518feb..d50c0a9835a0 100644
--- a/trunk/drivers/net/wireless/wl12xx/wl1271_main.c
+++ b/trunk/drivers/net/wireless/wl12xx/wl1271_main.c
@@ -938,7 +938,8 @@ static void wl1271_op_remove_interface(struct ieee80211_hw *hw,
 	WARN_ON(wl->state != WL1271_STATE_ON);
 
 	/* enable dyn ps just in case (if left on due to fw crash etc) */
-	ieee80211_disable_dyn_ps(wl->vif, false);
+	if (wl->bss_type == BSS_TYPE_STA_BSS)
+		ieee80211_disable_dyn_ps(wl->vif, false);
 
 	if (test_and_clear_bit(WL1271_FLAG_SCANNING, &wl->flags)) {
 		mutex_unlock(&wl->mutex);