tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
1
fork

Configure Feed

Select the types of activity you want to include in your feed.

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

Linus Torvalds 6be28d33 9cbbef4e

+6 -1
+1 -1
drivers/hid/hid-elo.c
··· 261 261 struct elo_priv *priv = hid_get_drvdata(hdev); 262 262 263 263 hid_hw_stop(hdev); 264 - flush_workqueue(wq); 264 + cancel_delayed_work_sync(&priv->work); 265 265 kfree(priv); 266 266 } 267 267
+5
drivers/hid/hid-multitouch.c
··· 1401 1401 MT_USB_DEVICE(USB_VENDOR_ID_NOVATEK, 1402 1402 USB_DEVICE_ID_NOVATEK_PCT) }, 1403 1403 1404 + /* Ntrig Panel */ 1405 + { .driver_data = MT_CLS_NSMU, 1406 + HID_DEVICE(BUS_I2C, HID_GROUP_MULTITOUCH_WIN_8, 1407 + USB_VENDOR_ID_NTRIG, 0x1b05) }, 1408 + 1404 1409 /* PixArt optical touch screen */ 1405 1410 { .driver_data = MT_CLS_INRANGE_CONTACTNUMBER, 1406 1411 MT_USB_DEVICE(USB_VENDOR_ID_PIXART,