Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e40ec6ff authored by Dmitry Torokhov's avatar Dmitry Torokhov
Browse files

Input: hil-mlc - use del_timer_sync() when unloading the driver 



del_timer() does not wait for the timer to finish running before returning
and therefore is technically not safe. Also make sure to enable tasklet
before kicking timer that will schedule it.

Signed-off-by: default avatarDmitry Torokhov <dtor@mail.ru>
parent 898d1053

drivers/input/serio/hil_mlc.c

+3 −5
Original line number Diff line number Diff line
@@ -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);