projects
/
linux-2.6-block.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge tag 'dt-3.10-4' of git://git.infradead.org/users/jcooper/linux into next/dt2
[linux-2.6-block.git]
/
drivers
/
net
/
wireless
/
mwifiex
/
init.c
diff --git
a/drivers/net/wireless/mwifiex/init.c
b/drivers/net/wireless/mwifiex/init.c
index e38aa9b3663d0a76c0cfe1c7f0698f923fc58587..0ff4c37ab42ae6853dbe6c85f8bb33f476b531e1 100644
(file)
--- 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;
}
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");
/* shut down mwifiex */
dev_dbg(adapter->dev, "info: shutdown mwifiex...\n");