diff options
| author | Ingo Molnar | 2017-10-23 13:30:47 +0200 |
|---|---|---|
| committer | Ingo Molnar | 2017-10-23 13:30:47 +0200 |
| commit | f95b23a112f1a31ea042483540cd907b58d23a5f (patch) | |
| tree | 3d41d2f8cf1d66ed593deb12f25a30d2905eb077 /drivers/net/wireless/quantenna/qtnfmac/event.c | |
| parent | x86/entry: Use SYSCALL_DEFINE() macros for sys_modify_ldt() (diff) | |
| parent | x86/unwind: Show function name+offset in ORC error messages (diff) | |
| download | kernel-qcow2-linux-f95b23a112f1a31ea042483540cd907b58d23a5f.tar.gz kernel-qcow2-linux-f95b23a112f1a31ea042483540cd907b58d23a5f.tar.xz kernel-qcow2-linux-f95b23a112f1a31ea042483540cd907b58d23a5f.zip | |
Merge branch 'x86/urgent' into x86/asm, to pick up dependent fixes
Signed-off-by: Ingo Molnar <mingo@kernel.org>
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 0fc2814eafad..43d2e7fd6e02 100644 --- a/drivers/net/wireless/quantenna/qtnfmac/event.c +++ b/drivers/net/wireless/quantenna/qtnfmac/event.c @@ -345,8 +345,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; |