Revert "mwifiex: cancel cmd timer and free curr_cmd in shutdown process

revert commit b9f1f48ce20a1b923429c216669d03b5a900a8cf which is commit
084c7189acb3f969c855536166042e27f5dd703f upstream.

It shouldn't have been applied to the 3.4-stable tree.

Reported-by: Ben Hutchings <ben@decadent.org.uk>
Cc: Marco Cesarano <marco@marvell.com>
Reported-by: Bing Zhao <bzhao@marvell.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/net/wireless/mwifiex/init.c b/drivers/net/wireless/mwifiex/init.c
index f9d9aedfd54b14893834f0b8114ac38ac965b073..54bb4839b57c7cc8f2e1dc4c11ab7f97896bbd9f 100644 (file)
--- a/drivers/net/wireless/mwifiex/init.c
+++ b/drivers/net/wireless/mwifiex/init.c
@@ -584,14 +584,6 @@ mwifiex_shutdown_drv(struct mwifiex_adapter *adapter)
                return ret;
        }
 
-       /* cancel current command */
-       if (adapter->curr_cmd) {
-               dev_warn(adapter->dev, "curr_cmd is still in processing\n");
-               del_timer(&adapter->cmd_timer);
-               mwifiex_insert_cmd_to_free_q(adapter, adapter->curr_cmd);
-               adapter->curr_cmd = NULL;
-       }
-
        /* shut down mwifiex */
        dev_dbg(adapter->dev, "info: shutdown mwifiex...\n");