1 files changed, 2 insertions, 13 deletions

diff --git a/drivers/net/wireless/mwifiex/init.c b/drivers/net/wireless/mwifiex/init.c
index 2cf8b964e966..6499117fce43 100644
--- a/drivers/net/wireless/mwifiex/init.c
+++ b/drivers/net/wireless/mwifiex/init.c
@@ -135,6 +135,8 @@ int mwifiex_init_priv(struct mwifiex_private *priv)
 
         priv->csa_chan = 0;
         priv->csa_expire_time = 0;
+        priv->del_list_idx = 0;
+        priv->hs2_enabled = false;
 
         return mwifiex_add_bss_prio_tbl(priv);
 }
@@ -377,18 +379,11 @@ static void mwifiex_free_lock_list(struct mwifiex_adapter *adapter)
 static void
 mwifiex_adapter_cleanup(struct mwifiex_adapter *adapter)
 {
-        int i;
-
         if (!adapter) {
                 pr_err("%s: adapter is NULL\n", __func__);
                 return;
         }
 
-        for (i = 0; i < adapter->priv_num; i++) {
-                if (adapter->priv[i])
-                        del_timer_sync(&adapter->priv[i]->scan_delay_timer);
-        }
-
         mwifiex_cancel_all_pending_cmd(adapter);
 
         /* Free lock variables */
@@ -398,13 +393,8 @@ mwifiex_adapter_cleanup(struct mwifiex_adapter *adapter)
         dev_dbg(adapter->dev, "info: free cmd buffer\n");
         mwifiex_free_cmd_buffer(adapter);
 
-        del_timer(&adapter->cmd_timer);
-
         dev_dbg(adapter->dev, "info: free scan table\n");
 
-        if (adapter->if_ops.cleanup_if)
-                adapter->if_ops.cleanup_if(adapter);
-
         if (adapter->sleep_cfm)
                 dev_kfree_skb_any(adapter->sleep_cfm);
 }
@@ -702,7 +692,6 @@ int mwifiex_dnld_fw(struct mwifiex_adapter *adapter,
                 if (!adapter->winner) {
                         dev_notice(adapter->dev,
                                    "FW already running! Skip FW dnld\n");
-                        poll_num = MAX_MULTI_INTERFACE_POLL_TRIES;
                         goto poll_fw;
                 }
         }