1 files changed, 21 insertions, 6 deletions

diff --git a/drivers/net/wireless/mwifiex/cfg80211.c b/drivers/net/wireless/mwifiex/cfg80211.c
index 2691620393ea..0679458a1bac 100644
--- a/drivers/net/wireless/mwifiex/cfg80211.c
+++ b/drivers/net/wireless/mwifiex/cfg80211.c
@@ -1596,8 +1596,9 @@ done:
                 }
         }
 
-        if (mwifiex_bss_start(priv, bss, &req_ssid))
-                return -EFAULT;
+        ret = mwifiex_bss_start(priv, bss, &req_ssid);
+        if (ret)
+                return ret;
 
         if (mode == NL80211_IFTYPE_ADHOC) {
                 /* Inform the BSS information to kernel, otherwise
@@ -1652,9 +1653,19 @@ done:
                         "info: association to bssid %pM failed\n",
                         priv->cfg_bssid);
                 memset(priv->cfg_bssid, 0, ETH_ALEN);
+
+                if (ret > 0)
+                        cfg80211_connect_result(priv->netdev, priv->cfg_bssid,
+                                                NULL, 0, NULL, 0, ret,
+                                                GFP_KERNEL);
+                else
+                        cfg80211_connect_result(priv->netdev, priv->cfg_bssid,
+                                                NULL, 0, NULL, 0,
+                                                WLAN_STATUS_UNSPECIFIED_FAILURE,
+                                                GFP_KERNEL);
         }
 
-        return ret;
+        return 0;
 }
 
 /*
@@ -1802,7 +1813,7 @@ mwifiex_cfg80211_scan(struct wiphy *wiphy,
 {
         struct net_device *dev = request->wdev->netdev;
         struct mwifiex_private *priv = mwifiex_netdev_get_priv(dev);
-        int i, offset;
+        int i, offset, ret;
         struct ieee80211_channel *chan;
         struct ieee_types_header *ie;
 
@@ -1855,8 +1866,12 @@ mwifiex_cfg80211_scan(struct wiphy *wiphy,
 
                 priv->user_scan_cfg->chan_list[i].scan_time = 0;
         }
-        if (mwifiex_scan_networks(priv, priv->user_scan_cfg))
-                return -EFAULT;
+
+        ret = mwifiex_scan_networks(priv, priv->user_scan_cfg);
+        if (ret) {
+                dev_err(priv->adapter->dev, "scan failed: %d\n", ret);
+                return ret;
+        }
 
         if (request->ie && request->ie_len) {
                 for (i = 0; i < MWIFIEX_MAX_VSIE_NUM; i++) {