From 9755681401e4c900328a9e86f5c5b4ee3d48bbb3 Mon Sep 17 00:00:00 2001
From: Tim Gardner <tim.gardner@canonical.com>
Date: Fri, 7 Dec 2012 06:28:34 -0700
Subject: [PATCH] --- yaml --- r: 342127 b: refs/heads/master c:
 8907a6fb6281a9aa25df2c7e2996cedcd6e5559f h: refs/heads/master i:   342125:
 2e13b81094feb34191431e6e232b5a4a9737cbbb   342123:
 df163ce22cc5f24bd38aabddeb43f73b666dea71   342119:
 3ac93d6897976be9ceb1645b246d62666a7729b9   342111:
 daff62b286616bd5882e442e70ff5e6082181a64 v: v3

---
 [refs]                                        | 2 +-
 trunk/drivers/net/wireless/iwlwifi/dvm/scan.c | 5 +++--
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index 009e0ffbba96..1d960d8d45c4 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: c8a8ab4472619e6936a224c5a950750d640aefbb
+refs/heads/master: 8907a6fb6281a9aa25df2c7e2996cedcd6e5559f
diff --git a/trunk/drivers/net/wireless/iwlwifi/dvm/scan.c b/trunk/drivers/net/wireless/iwlwifi/dvm/scan.c
index aad5fa424a58..610ed2204e1f 100644
--- a/trunk/drivers/net/wireless/iwlwifi/dvm/scan.c
+++ b/trunk/drivers/net/wireless/iwlwifi/dvm/scan.c
@@ -673,8 +673,9 @@ static int iwlagn_request_scan(struct iwl_priv *priv, struct ieee80211_vif *vif)
 	const u8 *ssid = NULL;
 	u8 ssid_len = 0;
 
-	if (WARN_ON_ONCE(priv->scan_request &&
-			 priv->scan_request->n_channels > MAX_SCAN_CHANNEL))
+	if (WARN_ON(priv->scan_type == IWL_SCAN_NORMAL &&
+		    (!priv->scan_request ||
+		     priv->scan_request->n_channels > MAX_SCAN_CHANNEL)))
 		return -EINVAL;
 
 	lockdep_assert_held(&priv->mutex);