From 5f04ae9f7da4a053e924994704393fdebb8c2edf Mon Sep 17 00:00:00 2001 From: Bing Zhao Date: Fri, 15 Mar 2013 18:47:07 -0700 Subject: [PATCH] --- yaml --- r: 361819 b: refs/heads/master c: 084c7189acb3f969c855536166042e27f5dd703f h: refs/heads/master i: 361817: 11683c377d3a3de327830d65dd9feff571f874bd 361815: 8114c3e8a4b92c16823a1e421c6f8cc5f2476e2c v: v3 --- [refs] | 2 +- trunk/drivers/net/wireless/mwifiex/init.c | 8 ++++++++ 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index 9c92e8c14d42..05ea65578c75 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: a3e240cacc93a06bff3313e28938e980d01a2160 +refs/heads/master: 084c7189acb3f969c855536166042e27f5dd703f diff --git a/trunk/drivers/net/wireless/mwifiex/init.c b/trunk/drivers/net/wireless/mwifiex/init.c index e38aa9b3663d..0ff4c37ab42a 100644 --- a/trunk/drivers/net/wireless/mwifiex/init.c +++ b/trunk/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");