Skip to content

Commit 6c9594b

Browse files
committed
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()
2 parents b226c9e + 768ea88 commit 6c9594b

File tree

3 files changed

+11
-0
lines changed

3 files changed

+11
-0
lines changed

drivers/input/ff-memless.c

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -489,6 +489,15 @@ static void ml_ff_destroy(struct ff_device *ff)
489489
{
490490
struct ml_device *ml = ff->private;
491491

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+
492501
kfree(ml->private);
493502
}
494503

drivers/input/mouse/synaptics.c

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -177,6 +177,7 @@ static const char * const smbus_pnp_ids[] = {
177177
"LEN0096", /* X280 */
178178
"LEN0097", /* X280 -> ALPS trackpoint */
179179
"LEN009b", /* T580 */
180+
"LEN0402", /* X1 Extreme 2nd Generation */
180181
"LEN200f", /* T450s */
181182
"LEN2054", /* E480 */
182183
"LEN2055", /* E580 */

drivers/input/rmi4/rmi_f54.c

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -730,6 +730,7 @@ static void rmi_f54_remove(struct rmi_function *fn)
730730

731731
video_unregister_device(&f54->vdev);
732732
v4l2_device_unregister(&f54->v4l2);
733+
destroy_workqueue(f54->workqueue);
733734
}
734735

735736
struct rmi_function_handler rmi_f54_handler = {

0 commit comments

Comments
 (0)