X-Git-Url: https://git.openpandora.org/cgi-bin/gitweb.cgi?p=pandora-kernel.git;a=blobdiff_plain;f=drivers%2Fnet%2Fwireless%2Fwl1251%2Fevent.c;h=8c70b14b9191e8577037a3ac9b4e2e45cefdcbb3;hp=bd1e90f113fb0993e58441172ded31194b99dcca;hb=48f7897661fb92e22369766cdf6729fff74f9139;hpb=52dd3581a9a3479fa41698310f9d590843e300bb;ds=sidebyside

diff --git a/drivers/net/wireless/wl1251/event.c b/drivers/net/wireless/wl1251/event.c
index bd1e90f113fb..8c70b14b9191 100644
--- a/drivers/net/wireless/wl1251/event.c
+++ b/drivers/net/wireless/wl1251/event.c
@@ -109,12 +109,17 @@ static int wl1251_event_process(struct wl1251 *wl, struct event_mailbox *mbox)
 			if (ret < 0)
 				wl1251_error("beacon filter enable failed");
 
-		} else if (mbox->ps_status == ENTER_POWER_SAVE_FAIL)
-			wl->station_mode = STATION_ACTIVE_MODE;
-		else if (mbox->ps_status == EXIT_POWER_SAVE_FAIL)
-			wl->station_mode = STATION_POWER_SAVE_MODE;
+		} else if (wl->ps_transitioning) {
+			if (mbox->ps_status == ENTER_POWER_SAVE_FAIL)
+				wl->station_mode = STATION_ACTIVE_MODE;
+			/* always happens on exit from idle - ignore for now
+			else if (mbox->ps_status == EXIT_POWER_SAVE_FAIL)
+				wl->station_mode = STATION_POWER_SAVE_MODE;
+			*/
+		}
 
-		//wl1251_error("ps_status %d", mbox->ps_status);
+		//wl1251_error("ps_status %d, mode %d",
+		//	mbox->ps_status, wl->station_mode);
 		wl->ps_transitioning = false;
 	}