mwifiex: minor cleanup and a fix in scan semaphore usage

mwifiex_request_scan() takes care of synchronous internal scan
performed by driver during association.
Currently the semaphore acquired for the scan is unnecessarily
released at the end of different paths. Also, failure paths
returning error code other than "-1" are not considered.

We will release it at the end of routine to fix above issues.

Signed-off-by: Amitkumar Karwar <akarwar@marvell.com>
Signed-off-by: Bing Zhao <bzhao@marvell.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>

1 files changed, 1 insertions, 9 deletions

diff --git a/drivers/net/wireless/mwifiex/scan.c b/drivers/net/wireless/mwifiex/scan.c
index 32b79ddd774b..9c0ad0fe276a 100644
--- a/drivers/net/wireless/mwifiex/scan.c
+++ b/drivers/net/wireless/mwifiex/scan.c
@@ -1762,10 +1762,6 @@ int mwifiex_ret_802_11_scan(struct mwifiex_private *priv,
                 }
                 if (priv->report_scan_result)
                         priv->report_scan_result = false;
-                if (priv->scan_pending_on_block) {
-                        priv->scan_pending_on_block = false;
-                        up(&priv->async_sem);
-                }
 
                 if (priv->user_scan_cfg) {
                         if (priv->scan_request) {
@@ -1914,7 +1910,6 @@ int mwifiex_request_scan(struct mwifiex_private *priv,
                         __func__);
                 return -1;
         }
-        priv->scan_pending_on_block = true;
 
         priv->adapter->scan_wait_q_woken = false;
 
@@ -1928,10 +1923,7 @@ int mwifiex_request_scan(struct mwifiex_private *priv,
         if (!ret)
                 ret = mwifiex_wait_queue_complete(priv->adapter);
 
-        if (ret == -1) {
-                priv->scan_pending_on_block = false;
-                up(&priv->async_sem);
-        }
+        up(&priv->async_sem);
 
         return ret;
 }