git.samba.org
/
sfrench
/
cifs-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge tag 'for-linus-4.14c-rc7-tag' of git://git.kernel.org/pub/scm/linux/kernel...
[sfrench/cifs-2.6.git]
/
drivers
/
net
/
wireless
/
quantenna
/
qtnfmac
/
event.c
diff --git
a/drivers/net/wireless/quantenna/qtnfmac/event.c
b/drivers/net/wireless/quantenna/qtnfmac/event.c
index 0fc2814eafad255dfa7ee1074f084fd4016840e5..43d2e7fd6e0211766d4140841a2450f74c1a0788 100644
(file)
--- 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;