diff options
author | Kalle Valo <kvalo@codeaurora.org> | 2017-10-16 17:06:54 +0300 |
---|---|---|
committer | Kalle Valo <kvalo@codeaurora.org> | 2017-10-16 17:09:24 +0300 |
commit | 0fac9e2dff00a2344ffc81d82749181ffae408a2 (patch) | |
tree | 1399ce5ce12955c971c4727dd70bc8b4db2754f1 /drivers/net/wireless/quantenna/qtnfmac/event.c | |
parent | a39644b235c1a45f84d6e16603cacb93740ed2d4 (diff) | |
parent | a6127b4440d1f74f26b64006b2f50c9dc6d66efc (diff) | |
download | linux-stable-0fac9e2dff00a2344ffc81d82749181ffae408a2.tar.gz linux-stable-0fac9e2dff00a2344ffc81d82749181ffae408a2.tar.bz2 linux-stable-0fac9e2dff00a2344ffc81d82749181ffae408a2.zip |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/kvalo/wireless-drivers.git
Mark Brown reported that there are conflicts in iwlwifi between the two trees
so fix those now.
Diffstat (limited to 'drivers/net/wireless/quantenna/qtnfmac/event.c')
-rw-r--r-- | drivers/net/wireless/quantenna/qtnfmac/event.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/drivers/net/wireless/quantenna/qtnfmac/event.c b/drivers/net/wireless/quantenna/qtnfmac/event.c index f639ea39c682..4b29f9fb9c3c 100644 --- a/drivers/net/wireless/quantenna/qtnfmac/event.c +++ b/drivers/net/wireless/quantenna/qtnfmac/event.c @@ -334,8 +334,6 @@ qtnf_event_handle_scan_complete(struct qtnf_wmac *mac, return -EINVAL; } - if (timer_pending(&mac->scan_timeout)) - del_timer_sync(&mac->scan_timeout); qtnf_scan_done(mac, le32_to_cpu(status->flags) & QLINK_SCAN_ABORTED); return 0; |