Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input
Pull more input fixes from Dmitry Torokhov:
"A couple of fixes in driver teardown paths and another ID for
Synaptics RMI mode"
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input:
Input: synaptics - enable RMI mode for X1 Extreme 2nd Generation
Input: synaptics-rmi4 - destroy F54 poller workqueue when removing
Input: ff-memless - kill timer in destroy()
+11
+9
drivers/input/ff-memless.c
+9
drivers/input/ff-memless.c
···
489
489
{
490
490
struct ml_device *ml = ff->private;
491
491
492
+
/*
493
+
* Even though we stop all playing effects when tearing down
494
+
* an input device (via input_device_flush() that calls into
495
+
* input_ff_flush() that stops and erases all effects), we
496
+
* do not actually stop the timer, and therefore we should
497
+
* do it here.
498
+
*/
499
+
del_timer_sync(&ml->timer);
500
+
492
501
kfree(ml->private);
493
502
}
494
503
+1
drivers/input/mouse/synaptics.c
+1
drivers/input/mouse/synaptics.c