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;