diff --git a/[refs] b/[refs]
index 8850aa08e979..b63ed9f63439 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 845025634549850879d30f00e20bc8bfe63980b4
+refs/heads/master: 461fa136bb120f5b6b7d5814888a7211dbbd211b
diff --git a/trunk/drivers/net/wireless/wl12xx/wl1271_event.c b/trunk/drivers/net/wireless/wl12xx/wl1271_event.c
index e135d894b42a..d13fdd99c85c 100644
--- a/trunk/drivers/net/wireless/wl12xx/wl1271_event.c
+++ b/trunk/drivers/net/wireless/wl12xx/wl1271_event.c
@@ -78,12 +78,16 @@ static int wl1271_event_ps_report(struct wl1271 *wl,
 
 	switch (mbox->ps_status) {
 	case EVENT_ENTER_POWER_SAVE_FAIL:
+		if (!wl->psm) {
+			wl->psm_entry_retry = 0;
+			break;
+		}
+
 		if (wl->psm_entry_retry < wl->conf.conn.psm_entry_retries) {
 			wl->psm_entry_retry++;
-			wl1271_error("PSM entry failed, retrying %d\n",
-				     wl->psm_entry_retry);
 			ret = wl1271_ps_set_mode(wl, STATION_POWER_SAVE_MODE);
 		} else {
+			wl1271_error("PSM entry failed, giving up.\n");
 			wl->psm_entry_retry = 0;
 			*beacon_loss = true;
 		}