Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid
Pull HID fixes from Jiri Kosina:
- kernel crash fixes for multitouch and wacom drivers, by Brent Adam
and Dan Carpenter
- cp2112 data packet race condition corruption fix, by Antonio Borneo
- a few new device IDs for wacom and microsoft drivers
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid:
HID: cp2112: fix to force single data-report reply
HID: wacom: Enable pad device for older Bamboo Touch tablets
HID: multitouch: Fix fields from pen report ID being interpreted for multitouch
HID: microsoft: Add quirk for MS Surface Type/Touch cover
HID: wacom: NULL dereferences on error in probe()
+19
-2
+2
drivers/hid/hid-cp2112.c
+2
drivers/hid/hid-cp2112.c
+7
drivers/hid/hid-multitouch.c
+7
drivers/hid/hid-multitouch.c
···
778
778
/*
779
779
* some egalax touchscreens have "application == HID_DG_TOUCHSCREEN"
780
780
* for the stylus.
781
+
* The check for mt_report_id ensures we don't process
782
+
* HID_DG_CONTACTCOUNT from the pen report as it is outside the physical
783
+
* collection, but within the report ID.
781
784
*/
782
785
if (field->physical == HID_DG_STYLUS)
786
+
return 0;
787
+
else if ((field->physical == 0) &&
788
+
(field->report->id != td->mt_report_id) &&
789
+
(td->mt_report_id != -1))
783
790
return 0;
784
791
785
792
if (field->application == HID_DG_TOUCHSCREEN ||
+3
drivers/hid/usbhid/hid-quirks.c
+3
drivers/hid/usbhid/hid-quirks.c
···
87
87
{ USB_VENDOR_ID_LOGITECH, USB_DEVICE_ID_LOGITECH_MOUSE_C05A, HID_QUIRK_ALWAYS_POLL },
88
88
{ USB_VENDOR_ID_LOGITECH, USB_DEVICE_ID_LOGITECH_MOUSE_C06A, HID_QUIRK_ALWAYS_POLL },
89
89
{ USB_VENDOR_ID_MGE, USB_DEVICE_ID_MGE_UPS, HID_QUIRK_NOGET },
90
+
{ USB_VENDOR_ID_MICROSOFT, USB_DEVICE_ID_MS_SURFACE_PRO_2, HID_QUIRK_NO_INIT_REPORTS },
91
+
{ USB_VENDOR_ID_MICROSOFT, USB_DEVICE_ID_MS_TYPE_COVER_2, HID_QUIRK_NO_INIT_REPORTS },
92
+
{ USB_VENDOR_ID_MICROSOFT, USB_DEVICE_ID_MS_TOUCH_COVER_2, HID_QUIRK_NO_INIT_REPORTS },
90
93
{ USB_VENDOR_ID_MICROSOFT, USB_DEVICE_ID_MS_TYPE_COVER_3, HID_QUIRK_NO_INIT_REPORTS },
91
94
{ USB_VENDOR_ID_MICROSOFT, USB_DEVICE_ID_MS_TYPE_COVER_3_JP, HID_QUIRK_NO_INIT_REPORTS },
92
95
{ USB_VENDOR_ID_MICROSOFT, USB_DEVICE_ID_MS_POWER_COVER, HID_QUIRK_NO_INIT_REPORTS },
+4
-2
drivers/hid/wacom_sys.c
+4
-2
drivers/hid/wacom_sys.c
···
1271
1271
pad_input_dev = NULL;
1272
1272
wacom_wac->pad_registered = false;
1273
1273
fail_register_pad_input:
1274
-
input_unregister_device(touch_input_dev);
1274
+
if (touch_input_dev)
1275
+
input_unregister_device(touch_input_dev);
1275
1276
wacom_wac->touch_input = NULL;
1276
1277
wacom_wac->touch_registered = false;
1277
1278
fail_register_touch_input:
1278
-
input_unregister_device(pen_input_dev);
1279
+
if (pen_input_dev)
1280
+
input_unregister_device(pen_input_dev);
1279
1281
wacom_wac->pen_input = NULL;
1280
1282
wacom_wac->pen_registered = false;
1281
1283
fail_register_pen_input: