summaryrefslogtreecommitdiffstats
path: root/drivers/isdn/sc/init.c
diff options
context:
space:
mode:
authorJulia Lawall <Julia.Lawall@lip6.fr>2014-03-26 22:33:39 +0100
committerDavid S. Miller <davem@davemloft.net>2014-03-27 20:28:06 +0100
commit0c295e44dea607be5f4cc2d19ce98afbd77e2619 (patch)
treef5a16d78e15cbc8e03c36cd8280471965ef01ac8 /drivers/isdn/sc/init.c
parenttcp: tcp_make_synack() minor changes (diff)
downloadlinux-0c295e44dea607be5f4cc2d19ce98afbd77e2619.tar.xz
linux-0c295e44dea607be5f4cc2d19ce98afbd77e2619.zip
isdn: replace del_timer by del_timer_sync
Use del_timer_sync to ensure that the timer is stopped on all CPUs before the driver exists. This change was suggested by Thomas Gleixner. The semantic patch that makes this change is as follows: (http://coccinelle.lip6.fr/) // <smpl> @r@ declarer name module_exit; identifier ex; @@ module_exit(ex); @@ identifier r.ex; @@ ex(...) { <... - del_timer + del_timer_sync (...) ...> } // </smpl> Signed-off-by: Julia Lawall <Julia.Lawall@lip6.fr> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/isdn/sc/init.c')
-rw-r--r--drivers/isdn/sc/init.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/isdn/sc/init.c b/drivers/isdn/sc/init.c
index 92acc81f844d..d6f19b168e8a 100644
--- 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