aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/wireless/iwlwifi/dvm/scan.c
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/net/wireless/iwlwifi/dvm/scan.c')
-rw-r--r--drivers/net/wireless/iwlwifi/dvm/scan.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/drivers/net/wireless/iwlwifi/dvm/scan.c b/drivers/net/wireless/iwlwifi/dvm/scan.c
index aad5fa424a58..610ed2204e1f 100644
--- a/drivers/net/wireless/iwlwifi/dvm/scan.c
+++ b/drivers/net/wireless/iwlwifi/dvm/scan.c
@@ -673,8 +673,9 @@ static int iwlagn_request_scan(struct iwl_priv *priv, struct ieee80211_vif *vif)
673 const u8 *ssid = NULL; 673 const u8 *ssid = NULL;
674 u8 ssid_len = 0; 674 u8 ssid_len = 0;
675 675
676 if (WARN_ON_ONCE(priv->scan_request && 676 if (WARN_ON(priv->scan_type == IWL_SCAN_NORMAL &&
677 priv->scan_request->n_channels > MAX_SCAN_CHANNEL)) 677 (!priv->scan_request ||
678 priv->scan_request->n_channels > MAX_SCAN_CHANNEL)))
678 return -EINVAL; 679 return -EINVAL;
679 680
680 lockdep_assert_held(&priv->mutex); 681 lockdep_assert_held(&priv->mutex);