From bd42a9650e85c4c7c88c63d1527428a19dc3f627 Mon Sep 17 00:00:00 2001
From: Chuansheng Liu <chuansheng.liu@intel.com>
Date: Wed, 7 Nov 2012 01:28:14 +0800
Subject: [PATCH] --- yaml --- r: 352144 b: refs/heads/master c:
 25b08bf662dea1291a9872547819f0e96bf68fe6 h: refs/heads/master v: v3

---
 [refs]                                    | 2 +-
 trunk/drivers/net/wireless/ti/wlcore/ps.c | 3 ---
 2 files changed, 1 insertion(+), 4 deletions(-)

diff --git a/[refs] b/[refs]
index bdaf4b363ea8..2e8526e90280 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 4eeac22c159f053ea34527e4fea359ab10b4b5a5
+refs/heads/master: 25b08bf662dea1291a9872547819f0e96bf68fe6
diff --git a/trunk/drivers/net/wireless/ti/wlcore/ps.c b/trunk/drivers/net/wireless/ti/wlcore/ps.c
index 4d1414a673fb..ffcd84336f04 100644
--- a/trunk/drivers/net/wireless/ti/wlcore/ps.c
+++ b/trunk/drivers/net/wireless/ti/wlcore/ps.c
@@ -151,9 +151,6 @@ int wl1271_ps_elp_wakeup(struct wl1271 *wl)
 			wl12xx_queue_recovery_work(wl);
 			ret = -ETIMEDOUT;
 			goto err;
-		} else if (ret < 0) {
-			wl1271_error("ELP wakeup completion error.");
-			goto err;
 		}
 	}