Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
Merge branch 'upstream-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid
* 'upstream-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid:
HID: Add Cando touch screen 15.6-inch product id
HID: Add MULTI_INPUT quirk for turbox/mosart touchscreen
HID: hidraw, fix a NULL pointer dereference in hidraw_write
HID: hidraw, fix a NULL pointer dereference in hidraw_ioctl
+17
+2
drivers/hid/hid-cando.c
+2
drivers/hid/hid-cando.c
···
237
237
USB_DEVICE_ID_CANDO_MULTI_TOUCH) },
238
238
{ HID_USB_DEVICE(USB_VENDOR_ID_CANDO,
239
239
USB_DEVICE_ID_CANDO_MULTI_TOUCH_11_6) },
240
+
{ HID_USB_DEVICE(USB_VENDOR_ID_CANDO,
241
+
USB_DEVICE_ID_CANDO_MULTI_TOUCH_15_6) },
240
242
{ }
241
243
};
242
244
MODULE_DEVICE_TABLE(hid, cando_devices);
+1
drivers/hid/hid-core.c
+1
drivers/hid/hid-core.c
···
1292
1292
{ HID_USB_DEVICE(USB_VENDOR_ID_BTC, USB_DEVICE_ID_BTC_EMPREX_REMOTE_2) },
1293
1293
{ HID_USB_DEVICE(USB_VENDOR_ID_CANDO, USB_DEVICE_ID_CANDO_MULTI_TOUCH) },
1294
1294
{ HID_USB_DEVICE(USB_VENDOR_ID_CANDO, USB_DEVICE_ID_CANDO_MULTI_TOUCH_11_6) },
1295
+
{ HID_USB_DEVICE(USB_VENDOR_ID_CANDO, USB_DEVICE_ID_CANDO_MULTI_TOUCH_15_6) },
1295
1296
{ HID_USB_DEVICE(USB_VENDOR_ID_CHERRY, USB_DEVICE_ID_CHERRY_CYMOTION) },
1296
1297
{ HID_USB_DEVICE(USB_VENDOR_ID_CHERRY, USB_DEVICE_ID_CHERRY_CYMOTION_SOLAR) },
1297
1298
{ HID_USB_DEVICE(USB_VENDOR_ID_CHICONY, USB_DEVICE_ID_CHICONY_TACTICAL_PAD) },
+2
drivers/hid/hid-ids.h
+2
drivers/hid/hid-ids.h
···
134
134
#define USB_VENDOR_ID_CANDO 0x2087
135
135
#define USB_DEVICE_ID_CANDO_MULTI_TOUCH 0x0a01
136
136
#define USB_DEVICE_ID_CANDO_MULTI_TOUCH_11_6 0x0b03
137
+
#define USB_DEVICE_ID_CANDO_MULTI_TOUCH_15_6 0x0f01
137
138
138
139
#define USB_VENDOR_ID_CH 0x068e
139
140
#define USB_DEVICE_ID_CH_PRO_PEDALS 0x00f2
···
504
503
505
504
#define USB_VENDOR_ID_TURBOX 0x062a
506
505
#define USB_DEVICE_ID_TURBOX_KEYBOARD 0x0201
506
+
#define USB_DEVICE_ID_TURBOX_TOUCHSCREEN_MOSART 0x7100
507
507
508
508
#define USB_VENDOR_ID_TWINHAN 0x6253
509
509
#define USB_DEVICE_ID_TWINHAN_IR_REMOTE 0x0100
+11
drivers/hid/hidraw.c
+11
drivers/hid/hidraw.c
···
109
109
int ret = 0;
110
110
111
111
mutex_lock(&minors_lock);
112
+
113
+
if (!hidraw_table[minor]) {
114
+
ret = -ENODEV;
115
+
goto out;
116
+
}
117
+
112
118
dev = hidraw_table[minor]->hid;
113
119
114
120
if (!dev->hid_output_raw_report) {
···
250
244
251
245
mutex_lock(&minors_lock);
252
246
dev = hidraw_table[minor];
247
+
if (!dev) {
248
+
ret = -ENODEV;
249
+
goto out;
250
+
}
253
251
254
252
switch (cmd) {
255
253
case HIDIOCGRDESCSIZE:
···
327
317
328
318
ret = -ENOTTY;
329
319
}
320
+
out:
330
321
mutex_unlock(&minors_lock);
331
322
return ret;
332
323
}
+1
drivers/hid/usbhid/hid-quirks.c
+1
drivers/hid/usbhid/hid-quirks.c
···
36
36
{ USB_VENDOR_ID_DWAV, USB_DEVICE_ID_EGALAX_TOUCHCONTROLLER, HID_QUIRK_MULTI_INPUT | HID_QUIRK_NOGET },
37
37
{ USB_VENDOR_ID_DWAV, USB_DEVICE_ID_DWAV_EGALAX_MULTITOUCH, HID_QUIRK_MULTI_INPUT },
38
38
{ USB_VENDOR_ID_MOJO, USB_DEVICE_ID_RETRO_ADAPTER, HID_QUIRK_MULTI_INPUT },
39
+
{ USB_VENDOR_ID_TURBOX, USB_DEVICE_ID_TURBOX_TOUCHSCREEN_MOSART, HID_QUIRK_MULTI_INPUT },
39
40
{ USB_VENDOR_ID_HAPP, USB_DEVICE_ID_UGCI_DRIVING, HID_QUIRK_BADPAD | HID_QUIRK_MULTI_INPUT },
40
41
{ USB_VENDOR_ID_HAPP, USB_DEVICE_ID_UGCI_FLYING, HID_QUIRK_BADPAD | HID_QUIRK_MULTI_INPUT },
41
42
{ USB_VENDOR_ID_HAPP, USB_DEVICE_ID_UGCI_FIGHTING, HID_QUIRK_BADPAD | HID_QUIRK_MULTI_INPUT },