From 051d3d7c3582dbed58ecf2e1d54dac65fcd8a896 Mon Sep 17 00:00:00 2001
From: Holger Schurig <hs4233@mail.mn-solutions.de>
Date: Fri, 11 Sep 2009 10:13:55 +0200
Subject: [PATCH] --- yaml --- r: 162895 b: refs/heads/master c:
 8862dc5f25153a3c565a097220ed3de14ed72dfd h: refs/heads/master i:   162893:
 c622d11283ab511a4930fcf31507910b99a13aeb   162891:
 92d0afdbdac5fc63330e32048f7ae5ebe436fc13   162887:
 251e895435c731b0523c2b127db5198243d5235f   162879:
 67c690dc46763f7a95ebdd08667cd1b0384fd756 v: v3

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

diff --git a/[refs] b/[refs]
index 2a0a4f84bfac..8128f307450f 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: a4e7b730f1c8c9179def7033a024183c58cf2538
+refs/heads/master: 8862dc5f25153a3c565a097220ed3de14ed72dfd
diff --git a/trunk/net/wireless/scan.c b/trunk/net/wireless/scan.c
index 6c20b6515ab0..e5f92ee758f4 100644
--- a/trunk/net/wireless/scan.c
+++ b/trunk/net/wireless/scan.c
@@ -675,6 +675,11 @@ int cfg80211_wext_siwscan(struct net_device *dev,
 		wext_freq_not_found: ;
 		}
 	}
+	/* No channels found? */
+	if (!i) {
+		err = -EINVAL;
+		goto out;
+	}
 
 	/* Set real number of channels specified in creq->channels[] */
 	creq->n_channels = i;