From 49950f3f41dac649e8794bbfcaf91618a8d621ff Mon Sep 17 00:00:00 2001
From: Arik Nemtsov <arik@wizery.com>
Date: Tue, 12 Mar 2013 17:19:45 +0200
Subject: [PATCH] --- yaml --- r: 369061 b: refs/heads/master c:
 75592be5e35b31eb28dacf578cfe82f0e9bc0ac0 h: refs/heads/master i:   369059:
 68538ddc94a5e4f50073d8fb8068ed1f7b3e86b1 v: v3

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

diff --git a/[refs] b/[refs]
index 91af4abbcaa7..8556dbd88bf4 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 0e752df6fda25993acc30e1162808fbb2543be03
+refs/heads/master: 75592be5e35b31eb28dacf578cfe82f0e9bc0ac0
diff --git a/trunk/drivers/net/wireless/ti/wlcore/main.c b/trunk/drivers/net/wireless/ti/wlcore/main.c
index 43865d1348ec..248daa9bb5fe 100644
--- a/trunk/drivers/net/wireless/ti/wlcore/main.c
+++ b/trunk/drivers/net/wireless/ti/wlcore/main.c
@@ -108,8 +108,7 @@ static void wl1271_reg_notify(struct wiphy *wiphy,
 
 	}
 
-	if (likely(wl->state == WLCORE_STATE_ON))
-		wlcore_regdomain_config(wl);
+	wlcore_regdomain_config(wl);
 }
 
 static int wl1271_set_rx_streaming(struct wl1271 *wl, struct wl12xx_vif *wlvif,
@@ -3364,6 +3363,10 @@ void wlcore_regdomain_config(struct wl1271 *wl)
 		return;
 
 	mutex_lock(&wl->mutex);
+
+	if (unlikely(wl->state != WLCORE_STATE_ON))
+		goto out;
+
 	ret = wl1271_ps_elp_wakeup(wl);
 	if (ret < 0)
 		goto out;