diff --git a/[refs] b/[refs]
index 6b3564f89d01..817a8b2296ee 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 50425b0977c53c6ac608f0b2c8a562a5c7cd5602
+refs/heads/master: 012a1b3e5e3561376dacf07efee15688284302c6
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;