1 files changed, 3 insertions, 5 deletions

diff --git a/drivers/input/serio/hil_mlc.c b/drivers/input/serio/hil_mlc.c
index 7ba9f2b2c041..6cd03ebaf5fb 100644
--- a/drivers/input/serio/hil_mlc.c
+++ b/drivers/input/serio/hil_mlc.c
@@ -993,10 +993,8 @@ int hil_mlc_unregister(hil_mlc *mlc)
 
 static int __init hil_mlc_init(void)
 {
-        init_timer(&hil_mlcs_kicker);
-        hil_mlcs_kicker.expires = jiffies + HZ;
-        hil_mlcs_kicker.function = &hil_mlcs_timer;
-        add_timer(&hil_mlcs_kicker);
+        setup_timer(&hil_mlcs_kicker, &hil_mlcs_timer, 0);
+        mod_timer(&hil_mlcs_kicker, jiffies + HZ);
 
         tasklet_enable(&hil_mlcs_tasklet);
 
@@ -1005,7 +1003,7 @@ static int __init hil_mlc_init(void)
 
 static void __exit hil_mlc_exit(void)
 {
-        del_timer(&hil_mlcs_kicker);
+        del_timer_sync(&hil_mlcs_kicker);
 
         tasklet_disable(&hil_mlcs_tasklet);
         tasklet_kill(&hil_mlcs_tasklet);