projects
/
firefly-linux-kernel-4.4.55.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge tag 'isci-for-3.5' into misc
[firefly-linux-kernel-4.4.55.git]
/
drivers
/
net
/
wireless
/
wl1251
/
main.c
diff --git
a/drivers/net/wireless/wl1251/main.c
b/drivers/net/wireless/wl1251/main.c
index 41302c7b1ad0089480a495a26dac4da2552eecf2..d1afb8e3b2ef0a3673b5ff9ef60f98379180bfa3 100644
(file)
--- a/
drivers/net/wireless/wl1251/main.c
+++ b/
drivers/net/wireless/wl1251/main.c
@@
-479,6
+479,7
@@
static void wl1251_op_stop(struct ieee80211_hw *hw)
cancel_work_sync(&wl->irq_work);
cancel_work_sync(&wl->tx_work);
cancel_work_sync(&wl->filter_work);
+ cancel_delayed_work_sync(&wl->elp_work);
mutex_lock(&wl->mutex);