From fb5cd08d0a81d3f00e7f4621708ee20bdbf2d509 Mon Sep 17 00:00:00 2001
From: Pontus Fuchs <pontus.fuchs@gmail.com>
Date: Wed, 11 Jan 2012 14:22:42 +0100
Subject: [PATCH] --- yaml --- r: 290559 b: refs/heads/master c:
 9e0dc890ce23e2b28ce906bb8f466ca66f420911 h: refs/heads/master i:   290557:
 763eb9e7827cc71ffa92241de6e5d1a04f141c23   290555:
 3e281b67030eccc5b4e4fbd98738c704271416a3   290551:
 495076cda0319603ba8138ff237fbcbdf4418380   290543:
 b90f01b6adcaf98c7d53b45c5f6fe02c113be08c   290527:
 91ea47628ac0f4eebb2c999c471c20e595bf20bf   290495:
 f59afb8185c5cd7d83c7e3e5552e1684c9b79dc9   290431:
 2027a589337c7ece933a201e1f4c799a09c013ae   290303:
 64926f33b210766889075baf278f6e2e0d308dc7 v: v3

---
 [refs]                                   | 2 +-
 trunk/drivers/net/wireless/wl12xx/main.c | 8 ++++++++
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index a8cb70ddbb84..d43c84a1e074 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 15944aef29b6a3d96c52f3140c08b5a9d5fda0e9
+refs/heads/master: 9e0dc890ce23e2b28ce906bb8f466ca66f420911
diff --git a/trunk/drivers/net/wireless/wl12xx/main.c b/trunk/drivers/net/wireless/wl12xx/main.c
index f8748cedbae1..f2a958c9537a 100644
--- a/trunk/drivers/net/wireless/wl12xx/main.c
+++ b/trunk/drivers/net/wireless/wl12xx/main.c
@@ -3108,6 +3108,11 @@ static int wl1271_op_sched_scan_start(struct ieee80211_hw *hw,
 
 	mutex_lock(&wl->mutex);
 
+	if (wl->state == WL1271_STATE_OFF) {
+		ret = -EAGAIN;
+		goto out;
+	}
+
 	ret = wl1271_ps_elp_wakeup(wl);
 	if (ret < 0)
 		goto out;
@@ -3139,6 +3144,9 @@ static void wl1271_op_sched_scan_stop(struct ieee80211_hw *hw,
 
 	mutex_lock(&wl->mutex);
 
+	if (wl->state == WL1271_STATE_OFF)
+		goto out;
+
 	ret = wl1271_ps_elp_wakeup(wl);
 	if (ret < 0)
 		goto out;