Commit 6c9594bd authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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()
parents b226c9e1 768ea88b

drivers/input/ff-memless.c

+9 −0
Original line number Diff line number Diff line
@@ -489,6 +489,15 @@ static void ml_ff_destroy(struct ff_device *ff) 
{

	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);

}

drivers/input/mouse/synaptics.c

+1 −0
Original line number Diff line number Diff line
@@ -177,6 +177,7 @@ static const char * const smbus_pnp_ids[] = { 
	"LEN0096", /* X280 */

	"LEN0097", /* X280 -> ALPS trackpoint */

	"LEN009b", /* T580 */

	"LEN0402", /* X1 Extreme 2nd Generation */

	"LEN200f", /* T450s */

	"LEN2054", /* E480 */

	"LEN2055", /* E580 */

drivers/input/rmi4/rmi_f54.c

+1 −0
Original line number Diff line number Diff line
@@ -730,6 +730,7 @@ static void rmi_f54_remove(struct rmi_function *fn) 


	video_unregister_device(&f54->vdev);

	v4l2_device_unregister(&f54->v4l2);

	destroy_workqueue(f54->workqueue);

}



struct rmi_function_handler rmi_f54_handler = {

CRA Git | Maintained and supported by SUSTech CRA and CCSE