diff options
| author | John W. Linville | 2013-03-29 21:41:36 +0100 |
|---|---|---|
| committer | John W. Linville | 2013-03-29 21:41:36 +0100 |
| commit | 9a574cd67a447059f9c14bbef47873315d7f7b35 (patch) | |
| tree | 0ebb71d213d868d8884b1fa0e05b7393c66c665b /drivers/net/wireless/mwifiex/init.c | |
| parent | brcmsmac: remove some pmu functions and use the bcma equivalents (diff) | |
| parent | b43: N-PHY: use more bits for offset in RSSI calibration (diff) | |
| download | kernel-qcow2-linux-9a574cd67a447059f9c14bbef47873315d7f7b35.tar.gz kernel-qcow2-linux-9a574cd67a447059f9c14bbef47873315d7f7b35.tar.xz kernel-qcow2-linux-9a574cd67a447059f9c14bbef47873315d7f7b35.zip | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless
Conflicts:
net/mac80211/sta_info.c
net/wireless/core.h
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 cab3434d0d52..daf8801cecd2 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"); |