diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2022-12-21 09:48:03 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2022-12-21 09:48:03 -0800 |
| commit | d264dd3bbbd16b56239e889023fbe49413a58eaf (patch) | |
| tree | 09c3b4eb9b6255e53698d6def1ba470c2456dd38 /drivers/hid/hid-multitouch.c | |
| parent | 5461e079009ae2732c833281c4b50dfb58d15ba5 (diff) | |
| parent | 54f27dc53f1764986d417cfafe1013806deba668 (diff) | |
Merge tag 'for-linus-2022122101' of git://git.kernel.org/pub/scm/linux/kernel/git/hid/hid
Pull HID updates from Benjamin Tissoires:
- Four potential NULL pointers dereferences (Bastien Nocera, Enrik
Berkhan, Jiasheng Jiang and Roderick Colenbrander)
- Allow Wacom devices in bootloader mode to be flashed (Jason Gerecke)
- Some assorted devices quirks (José Expósito and Terry Junge)
* tag 'for-linus-2022122101' of git://git.kernel.org/pub/scm/linux/kernel/git/hid/hid:
HID: sony: Fix unused function warning
HID: plantronics: Additional PIDs for double volume key presses quirk
HID: multitouch: fix Asus ExpertBook P2 P2451FA trackpoint
HID: Ignore HP Envy x360 eu0009nv stylus battery
HID: wacom: Ensure bootloader PID is usable in hidraw mode
HID: amd_sfh: Add missing check for dma_alloc_coherent
HID: playstation: fix free of uninialized pointer for DS4 in Bluetooth.
HID: mcp2221: don't connect hidraw
HID: logitech-hidpp: Guard FF init code against non-USB devices
Diffstat (limited to 'drivers/hid/hid-multitouch.c')
| -rw-r--r-- | drivers/hid/hid-multitouch.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/drivers/hid/hid-multitouch.c b/drivers/hid/hid-multitouch.c index 91a4d3fc30e0..372cbdd223e0 100644 --- a/drivers/hid/hid-multitouch.c +++ b/drivers/hid/hid-multitouch.c @@ -1967,6 +1967,10 @@ static const struct hid_device_id mt_devices[] = { HID_DEVICE(BUS_I2C, HID_GROUP_MULTITOUCH_WIN_8, USB_VENDOR_ID_ELAN, 0x313a) }, + { .driver_data = MT_CLS_WIN_8_FORCE_MULTI_INPUT, + HID_DEVICE(BUS_I2C, HID_GROUP_MULTITOUCH_WIN_8, + USB_VENDOR_ID_ELAN, 0x3148) }, + /* Elitegroup panel */ { .driver_data = MT_CLS_SERIAL, MT_USB_DEVICE(USB_VENDOR_ID_ELITEGROUP, |