---

yaml --- r: 290559 b: refs/heads/master c: 9e0dc89 h: refs/heads/master i: 290557: 763eb9e 290555: 3e281b6 290551: 495076c 290543: b90f01b 290527: 91ea476 290495: f59afb8 290431: 2027a58 290303: 64926f3 v: v3
git-mirror · Feb 15, 2012 · fb5cd08 · fb5cd08
1 parent e733089
commit fb5cd08
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 1 deletion.
diff --git 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
@@ -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;