From 16e860608f21d699c4b3191b15d4d19d002f3305 Mon Sep 17 00:00:00 2001
From: Luciano Coelho <coelho@ti.com>
Date: Thu, 12 May 2011 17:07:55 +0300
Subject: [PATCH] --- yaml --- r: 247649 b: refs/heads/master c:
 683c002447c12742f5151691083f68524f33b13a h: refs/heads/master i:   247647:
 56b94d5c0a1a839ad3ff1f0916ceff0275d2c66a v: v3

---
 [refs]                                   | 2 +-
 trunk/drivers/net/wireless/wl12xx/scan.c | 6 ++++++
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 6f6272a7eb61..0a60dc5b6235 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: d3eff81de6048d8af8f95f52f0f06625980f2efb
+refs/heads/master: 683c002447c12742f5151691083f68524f33b13a
diff --git a/trunk/drivers/net/wireless/wl12xx/scan.c b/trunk/drivers/net/wireless/wl12xx/scan.c
index 668ff46a6824..f37e5a391976 100644
--- a/trunk/drivers/net/wireless/wl12xx/scan.c
+++ b/trunk/drivers/net/wireless/wl12xx/scan.c
@@ -505,6 +505,12 @@ int wl1271_scan_sched_scan_start(struct wl1271 *wl)
 
 	wl1271_debug(DEBUG_CMD, "cmd periodic scan start");
 
+	if (wl->bss_type != BSS_TYPE_STA_BSS)
+		return -EOPNOTSUPP;
+
+	if (!test_bit(WL1271_FLAG_IDLE, &wl->flags))
+		return -EBUSY;
+
 	start = kzalloc(sizeof(*start), GFP_KERNEL);
 	if (!start)
 		return -ENOMEM;