diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2013-04-10 15:21:39 -0700 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2013-04-12 09:38:47 -0700 |
| commit | 0502f20f996b9f755a7356f744e844b82580d6a0 (patch) | |
| tree | 85409c32657b2c77d0397043f1685e6505e36b33 /drivers/net | |
| parent | cdc8958a19b38773292cb6916f77f1e3bdf6d0fc (diff) | |
| download | linux-3.10-0502f20f996b9f755a7356f744e844b82580d6a0.tar.gz linux-3.10-0502f20f996b9f755a7356f744e844b82580d6a0.tar.bz2 linux-3.10-0502f20f996b9f755a7356f744e844b82580d6a0.zip | |
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>
Diffstat (limited to 'drivers/net')
| -rw-r--r-- | drivers/net/wireless/mwifiex/init.c | 8 |
1 files changed, 0 insertions, 8 deletions
diff --git a/drivers/net/wireless/mwifiex/init.c b/drivers/net/wireless/mwifiex/init.c index f9d9aedfd54..54bb4839b57 100644 --- 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"); |