diff options
| author | John W. Linville <linville@tuxdriver.com> | 2014-03-31 15:22:17 -0400 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2014-03-31 15:22:17 -0400 |
| commit | 96da266e77637ae892b196f377908c51fa9f2d1a (patch) | |
| tree | bf3da12850bbd46082add3060f9a5253aed144e0 /drivers/net/wireless/mwifiex/main.c | |
| parent | 9109e17f7c3ace48629397b44db5ce06bf168644 (diff) | |
| parent | a31267c30880ebdc73e6815f58c69a665052fab8 (diff) | |
| download | op-kernel-dev-96da266e77637ae892b196f377908c51fa9f2d1a.zip op-kernel-dev-96da266e77637ae892b196f377908c51fa9f2d1a.tar.gz | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next into for-davem
Diffstat (limited to 'drivers/net/wireless/mwifiex/main.c')
| -rw-r--r-- | drivers/net/wireless/mwifiex/main.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/net/wireless/mwifiex/main.c b/drivers/net/wireless/mwifiex/main.c index 7b4502f..77db088 100644 --- a/drivers/net/wireless/mwifiex/main.c +++ b/drivers/net/wireless/mwifiex/main.c @@ -38,7 +38,8 @@ static void scan_delay_timer_fn(unsigned long data) if (adapter->surprise_removed) return; - if (adapter->scan_delay_cnt == MWIFIEX_MAX_SCAN_DELAY_CNT) { + if (adapter->scan_delay_cnt == MWIFIEX_MAX_SCAN_DELAY_CNT || + !adapter->scan_processing) { /* * Abort scan operation by cancelling all pending scan * commands |
