Input: ff-memless - kill timer in destroy()
commit fa3a5a1880c91bb92594ad42dfe9eedad7996b86 upstream. No timer must be left running when the device goes away. Change-Id: Icd16bfab1811857f77e026577f340ad072aadab0 Signed-off-by: Oliver Neukum <oneukum@suse.com> Reported-and-tested-by: syzbot+b6c55daa701fc389e286@syzkaller.appspotmail.com Link: https://lore.kernel.org/r/1573726121.17351.3.camel@suse.com Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com> Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
This commit is contained in:
parent
a2ea4234eb
commit
72fb1a1e6c
|
@ -489,6 +489,15 @@ static void ml_ff_destroy(struct ff_device *ff)
|
||||||
{
|
{
|
||||||
struct ml_device *ml = ff->private;
|
struct ml_device *ml = ff->private;
|
||||||
|
|
||||||
|
/*
|
||||||
|
* Even though we stop all playing effects when tearing down
|
||||||
|
* an input device (via input_device_flush() that calls into
|
||||||
|
* input_ff_flush() that stops and erases all effects), we
|
||||||
|
* do not actually stop the timer, and therefore we should
|
||||||
|
* do it here.
|
||||||
|
*/
|
||||||
|
del_timer_sync(&ml->timer);
|
||||||
|
|
||||||
kfree(ml->private);
|
kfree(ml->private);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue