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

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

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid 

Pull HID subsystem fixes from Jiri Kosina:

 - kernel panic fix in hid-elo from Oliver Neukum

 - Surface Pro 3 device quirk from Benjamin Tissoires

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid:
  HID: multitouch: Add MT_QUIRK_NOT_SEEN_MEANS_UP to Surface Pro 3
  HID: elo: kill not flush the work
parents 9cbbef4e a80e803a

drivers/hid/hid-elo.c

+1 −1
Original line number Diff line number Diff line
@@ -261,7 +261,7 @@ static void elo_remove(struct hid_device *hdev) 
	struct elo_priv *priv = hid_get_drvdata(hdev);



	hid_hw_stop(hdev);

	flush_workqueue(wq);

	cancel_delayed_work_sync(&priv->work);

	kfree(priv);

}

drivers/hid/hid-multitouch.c

+5 −0
Original line number Diff line number Diff line
@@ -1401,6 +1401,11 @@ static const struct hid_device_id mt_devices[] = { 
		MT_USB_DEVICE(USB_VENDOR_ID_NOVATEK,

			USB_DEVICE_ID_NOVATEK_PCT) },



	/* Ntrig Panel */

	{ .driver_data = MT_CLS_NSMU,

		HID_DEVICE(BUS_I2C, HID_GROUP_MULTITOUCH_WIN_8,

			USB_VENDOR_ID_NTRIG, 0x1b05) },



	/* PixArt optical touch screen */

	{ .driver_data = MT_CLS_INRANGE_CONTACTNUMBER,

		MT_USB_DEVICE(USB_VENDOR_ID_PIXART,