aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/input/serio
diff options
context:
space:
mode:
authorThomas Gleixner <tglx@linutronix.de>2014-03-23 17:23:35 -0700
committerDmitry Torokhov <dmitry.torokhov@gmail.com>2014-03-23 17:25:40 -0700
commit5fcd4d2c119309366aad5d8287e1329d9dee02e1 (patch)
tree71d005e53f5b8d47b04c02d6a6bc4080eb52d0ce /drivers/input/serio
parentMerge tag 'v3.14-rc4' into next (diff)
downloadlinux-dev-5fcd4d2c119309366aad5d8287e1329d9dee02e1.tar.xz
linux-dev-5fcd4d2c119309366aad5d8287e1329d9dee02e1.zip
Input: hp_sdc - use del_timer_sync() in exit path
Make sure that no callback is running before we teardown the module. Signed-off-by: Thomas Gleixner <tglx@linutronix.de> Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com>
Diffstat (limited to 'drivers/input/serio')
-rw-r--r--drivers/input/serio/hp_sdc.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/input/serio/hp_sdc.c b/drivers/input/serio/hp_sdc.c
index d7a7e54f6465..852858e5d8d0 100644
--- a/drivers/input/serio/hp_sdc.c
+++ b/drivers/input/serio/hp_sdc.c
@@ -984,7 +984,7 @@ static void hp_sdc_exit(void)
free_irq(hp_sdc.irq, &hp_sdc);
write_unlock_irq(&hp_sdc.lock);
- del_timer(&hp_sdc.kicker);
+ del_timer_sync(&hp_sdc.kicker);
tasklet_kill(&hp_sdc.task);