diff options
author | John W. Linville <linville@tuxdriver.com> | 2013-03-20 14:26:37 -0400 |
---|---|---|
committer | John W. Linville <linville@tuxdriver.com> | 2013-03-20 14:26:37 -0400 |
commit | b9d5319041999401d29e7efcd5d15664edfaad2e (patch) | |
tree | 2d2097b3115d758834c08fc13a4a513b76d9701d /drivers/net/wireless/mwifiex/init.c | |
parent | net: fec: Define indexes as 'unsigned int' (diff) | |
parent | rtlwifi: usb: add missing freeing of skbuff (diff) | |
download | linux-dev-b9d5319041999401d29e7efcd5d15664edfaad2e.tar.xz linux-dev-b9d5319041999401d29e7efcd5d15664edfaad2e.zip |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless into for-davem
Diffstat (limited to 'drivers/net/wireless/mwifiex/init.c')
-rw-r--r-- | drivers/net/wireless/mwifiex/init.c | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/drivers/net/wireless/mwifiex/init.c b/drivers/net/wireless/mwifiex/init.c index e38aa9b3663d..0ff4c37ab42a 100644 --- a/drivers/net/wireless/mwifiex/init.c +++ b/drivers/net/wireless/mwifiex/init.c @@ -709,6 +709,14 @@ 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"); |