summaryrefslogtreecommitdiff
path: root/drivers/tty/serial/mux.c
diff options
context:
space:
mode:
authorJulia Lawall <Julia.Lawall@lip6.fr>2014-03-26 21:33:42 (GMT)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2014-04-24 23:13:01 (GMT)
commit0f1e126b8c50a479a9047654f8ceda5ccfaa0d8a (patch)
treed18651bfde1c0c7064c52fb3b49cfb45b2f7e4a6 /drivers/tty/serial/mux.c
parent22766ed8a235f3c9043678c7c594afe683b2372f (diff)
downloadlinux-0f1e126b8c50a479a9047654f8ceda5ccfaa0d8a.tar.xz
tty: serial: 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: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/tty/serial/mux.c')
-rw-r--r--drivers/tty/serial/mux.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/tty/serial/mux.c b/drivers/tty/serial/mux.c
index 9b27d34..be127d0 100644
--- a/drivers/tty/serial/mux.c
+++ b/drivers/tty/serial/mux.c
@@ -613,7 +613,7 @@ static void __exit mux_exit(void)
{
/* Delete the Mux timer. */
if(port_cnt > 0) {
- del_timer(&mux_timer);
+ del_timer_sync(&mux_timer);
#ifdef CONFIG_SERIAL_MUX_CONSOLE
unregister_console(&mux_console);
#endif