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/dtor/input
Pull input fixes from Dmitry Torokhov:
"Two more small fixups to the wacom driver"
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input:
Input: wacom - fix "can not retrieve extra class descriptor" for DTH2242
Input: wacom - DTH2242 Grip Pen id was off by one bit
+2
-2
+2
-2
drivers/input/tablet/wacom_wac.c
+2
-2
drivers/input/tablet/wacom_wac.c
···
359
359
case 0x802: /* Intuos4 General Pen */
360
360
case 0x804: /* Intuos4 Marker Pen */
361
361
case 0x40802: /* Intuos4 Classic Pen */
362
-
case 0x18803: /* DTH2242 Grip Pen */
362
+
case 0x18802: /* DTH2242 Grip Pen */
363
363
case 0x022:
364
364
wacom->tool[idx] = BTN_TOOL_PEN;
365
365
break;
···
2144
2144
{ USB_DEVICE_WACOM(0x44) },
2145
2145
{ USB_DEVICE_WACOM(0x45) },
2146
2146
{ USB_DEVICE_WACOM(0x59) },
2147
-
{ USB_DEVICE_WACOM(0x5D) },
2147
+
{ USB_DEVICE_DETAILED(0x5D, USB_CLASS_HID, 0, 0) },
2148
2148
{ USB_DEVICE_WACOM(0xB0) },
2149
2149
{ USB_DEVICE_WACOM(0xB1) },
2150
2150
{ USB_DEVICE_WACOM(0xB2) },