aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/wireless/mwifiex/scan.c
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/net/wireless/mwifiex/scan.c')
-rw-r--r--drivers/net/wireless/mwifiex/scan.c13
1 files changed, 5 insertions, 8 deletions
diff --git a/drivers/net/wireless/mwifiex/scan.c b/drivers/net/wireless/mwifiex/scan.c
index 13a80cb789af..9189a32b7844 100644
--- a/drivers/net/wireless/mwifiex/scan.c
+++ b/drivers/net/wireless/mwifiex/scan.c
@@ -1864,21 +1864,18 @@ static int mwifiex_scan_specific_ssid(struct mwifiex_private *priv,
1864 struct cfg80211_ssid *req_ssid) 1864 struct cfg80211_ssid *req_ssid)
1865{ 1865{
1866 struct mwifiex_adapter *adapter = priv->adapter; 1866 struct mwifiex_adapter *adapter = priv->adapter;
1867 int ret = 0; 1867 int ret;
1868 struct mwifiex_user_scan_cfg *scan_cfg; 1868 struct mwifiex_user_scan_cfg *scan_cfg;
1869 1869
1870 if (!req_ssid)
1871 return -1;
1872
1873 if (adapter->scan_processing) { 1870 if (adapter->scan_processing) {
1874 dev_dbg(adapter->dev, "cmd: Scan already in process...\n"); 1871 dev_err(adapter->dev, "cmd: Scan already in process...\n");
1875 return ret; 1872 return -EBUSY;
1876 } 1873 }
1877 1874
1878 if (priv->scan_block) { 1875 if (priv->scan_block) {
1879 dev_dbg(adapter->dev, 1876 dev_err(adapter->dev,
1880 "cmd: Scan is blocked during association...\n"); 1877 "cmd: Scan is blocked during association...\n");
1881 return ret; 1878 return -EBUSY;
1882 } 1879 }
1883 1880
1884 scan_cfg = kzalloc(sizeof(struct mwifiex_user_scan_cfg), GFP_KERNEL); 1881 scan_cfg = kzalloc(sizeof(struct mwifiex_user_scan_cfg), GFP_KERNEL);