From 5e3ec6a58bc2749663577fab743324a9a123cb86 Mon Sep 17 00:00:00 2001
From: Victor Goldenshtein <victorg@ti.com>
Date: Mon, 14 May 2012 16:07:38 +0300
Subject: [PATCH] --- yaml --- r: 314145 b: refs/heads/master c:
 a4203c6453afcd21b3a6f0be592bf74951e80c72 h: refs/heads/master i:   314143:
 c6aa33a431a3fc93dd65599c4c64eedef4624dd7 v: v3

---
 [refs]                                     |  2 +-
 trunk/drivers/net/wireless/ti/wlcore/cmd.c | 16 +++++++++++-----
 2 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/[refs] b/[refs]
index 053f0ecbf1d7..a64388302a14 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: e832837bbb91ae8610fa0a0f3d243d42823ec815
+refs/heads/master: a4203c6453afcd21b3a6f0be592bf74951e80c72
diff --git a/trunk/drivers/net/wireless/ti/wlcore/cmd.c b/trunk/drivers/net/wireless/ti/wlcore/cmd.c
index e8c650dec18c..df8d672b1f06 100644
--- a/trunk/drivers/net/wireless/ti/wlcore/cmd.c
+++ b/trunk/drivers/net/wireless/ti/wlcore/cmd.c
@@ -1606,19 +1606,25 @@ static int wl12xx_cmd_croc(struct wl1271 *wl, u8 role_id)
 int wl12xx_roc(struct wl1271 *wl, struct wl12xx_vif *wlvif, u8 role_id)
 {
 	int ret = 0;
+	bool is_first_roc;
 
 	if (WARN_ON(test_bit(role_id, wl->roc_map)))
 		return 0;
 
+	is_first_roc = (find_first_bit(wl->roc_map, WL12XX_MAX_ROLES) >=
+			WL12XX_MAX_ROLES);
+
 	ret = wl12xx_cmd_roc(wl, wlvif, role_id);
 	if (ret < 0)
 		goto out;
 
-	ret = wl1271_cmd_wait_for_event(wl,
-					REMAIN_ON_CHANNEL_COMPLETE_EVENT_ID);
-	if (ret < 0) {
-		wl1271_error("cmd roc event completion error");
-		goto out;
+	if (is_first_roc) {
+		ret = wl1271_cmd_wait_for_event(wl,
+					   REMAIN_ON_CHANNEL_COMPLETE_EVENT_ID);
+		if (ret < 0) {
+			wl1271_error("cmd roc event completion error");
+			goto out;
+		}
 	}
 
 	__set_bit(role_id, wl->roc_map);