projects
/
cascardo
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge tag 'for-f2fs-3.15' of git://git.kernel.org/pub/scm/linux/kernel/git/jaegeuk...
[cascardo/linux.git]
/
drivers
/
isdn
/
sc
/
init.c
diff --git
a/drivers/isdn/sc/init.c
b/drivers/isdn/sc/init.c
index
92acc81
..
d6f19b1
100644
(file)
--- a/
drivers/isdn/sc/init.c
+++ b/
drivers/isdn/sc/init.c
@@
-390,8
+390,8
@@
static void __exit sc_exit(void)
/*
* kill the timers
*/
- del_timer(&(sc_adapter[i]->reset_timer));
- del_timer(&(sc_adapter[i]->stat_timer));
+ del_timer
_sync
(&(sc_adapter[i]->reset_timer));
+ del_timer
_sync
(&(sc_adapter[i]->stat_timer));
/*
* Tell I4L we're toast