Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
tjh.dev
kernel
os
linux
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid:
HID: avoid '\0' in hid debugfs events file
HID: Add RGT Clutch Wheel clutch device id
HID: ntrig: fix touch events
HID: add quirk for UC-Logik WP4030 tablet
HID: magicmouse: fix oops after device removal
+1
drivers/hid/hid-core.c
+1
drivers/hid/hid-core.c
···
1357
1357
{ HID_USB_DEVICE(USB_VENDOR_ID_THRUSTMASTER, 0xb323) },
1358
1358
{ HID_USB_DEVICE(USB_VENDOR_ID_THRUSTMASTER, 0xb324) },
1359
1359
{ HID_USB_DEVICE(USB_VENDOR_ID_THRUSTMASTER, 0xb651) },
1360
+
{ HID_USB_DEVICE(USB_VENDOR_ID_THRUSTMASTER, 0xb653) },
1360
1361
{ HID_USB_DEVICE(USB_VENDOR_ID_THRUSTMASTER, 0xb654) },
1361
1362
{ HID_USB_DEVICE(USB_VENDOR_ID_TOPSEED, USB_DEVICE_ID_TOPSEED_CYBERLINK) },
1362
1363
{ HID_USB_DEVICE(USB_VENDOR_ID_TWINHAN, USB_DEVICE_ID_TWINHAN_IR_REMOTE) },
+3
-3
drivers/hid/hid-debug.c
+3
-3
drivers/hid/hid-debug.c
···
564
564
struct hid_debug_list *list;
565
565
566
566
list_for_each_entry(list, &hdev->debug_list, node) {
567
-
for (i = 0; i <= strlen(buf); i++)
568
-
list->hid_debug_buf[(list->tail + i) % (HID_DEBUG_BUFSIZE - 1)] =
567
+
for (i = 0; i < strlen(buf); i++)
568
+
list->hid_debug_buf[(list->tail + i) % HID_DEBUG_BUFSIZE] =
569
569
buf[i];
570
-
list->tail = (list->tail + i) % (HID_DEBUG_BUFSIZE - 1);
570
+
list->tail = (list->tail + i) % HID_DEBUG_BUFSIZE;
571
571
}
572
572
}
573
573
EXPORT_SYMBOL_GPL(hid_debug_event);
+1
drivers/hid/hid-ids.h
+1
drivers/hid/hid-ids.h
+5
-2
drivers/hid/hid-magicmouse.c
+5
-2
drivers/hid/hid-magicmouse.c
···
353
353
goto err_free;
354
354
}
355
355
356
-
ret = hid_hw_start(hdev, HID_CONNECT_DEFAULT);
356
+
ret = hid_hw_start(hdev, HID_CONNECT_DEFAULT & ~HID_CONNECT_HIDINPUT);
357
357
if (ret) {
358
358
dev_err(&hdev->dev, "magicmouse hw start failed\n");
359
359
goto err_free;
···
409
409
410
410
static void magicmouse_remove(struct hid_device *hdev)
411
411
{
412
+
struct magicmouse_sc *msc = hid_get_drvdata(hdev);
413
+
412
414
hid_hw_stop(hdev);
413
-
kfree(hid_get_drvdata(hdev));
415
+
input_unregister_device(msc->input);
416
+
kfree(msc);
414
417
}
415
418
416
419
static const struct hid_device_id magic_mice[] = {
+11
drivers/hid/hid-ntrig.c
+11
drivers/hid/hid-ntrig.c
···
140
140
nd->reading_mt = 1;
141
141
nd->first_contact_confidence = 0;
142
142
break;
143
+
case HID_DG_TIPSWITCH:
144
+
/* Prevent emission of touch until validated */
145
+
return 1;
143
146
case HID_DG_CONFIDENCE:
144
147
nd->confidence = value;
145
148
break;
···
262
259
BTN_TOOL_TRIPLETAP, 0);
263
260
input_report_key(input,
264
261
BTN_TOOL_QUADTAP, 0);
262
+
input_report_key(input, BTN_TOUCH, 0);
265
263
}
266
264
break;
267
265
···
312
308
313
309
314
310
list_for_each_entry(hidinput, &hdev->inputs, list) {
311
+
if (hidinput->report->maxfield < 1)
312
+
continue;
313
+
315
314
input = hidinput->input;
316
315
switch (hidinput->report->field[0]->application) {
317
316
case HID_DG_PEN:
318
317
input->name = "N-Trig Pen";
319
318
break;
320
319
case HID_DG_TOUCHSCREEN:
320
+
/* These keys are redundant for fingers, clear them
321
+
* to prevent incorrect identification */
321
322
__clear_bit(BTN_TOOL_PEN, input->keybit);
323
+
__clear_bit(BTN_TOOL_FINGER, input->keybit);
324
+
__clear_bit(BTN_0, input->keybit);
322
325
/*
323
326
* A little something special to enable
324
327
* two and three finger taps.
+2
drivers/hid/hid-tmff.c
+2
drivers/hid/hid-tmff.c
···
251
251
.driver_data = (unsigned long)ff_rumble },
252
252
{ HID_USB_DEVICE(USB_VENDOR_ID_THRUSTMASTER, 0xb651), /* FGT Rumble Force Wheel */
253
253
.driver_data = (unsigned long)ff_rumble },
254
+
{ HID_USB_DEVICE(USB_VENDOR_ID_THRUSTMASTER, 0xb653), /* RGT Force Feedback CLUTCH Raging Wheel */
255
+
.driver_data = (unsigned long)ff_joystick },
254
256
{ HID_USB_DEVICE(USB_VENDOR_ID_THRUSTMASTER, 0xb654), /* FGT Force Feedback Wheel */
255
257
.driver_data = (unsigned long)ff_joystick },
256
258
{ }
+1
drivers/hid/usbhid/hid-quirks.c
+1
drivers/hid/usbhid/hid-quirks.c
···
63
63
{ USB_VENDOR_ID_SUN, USB_DEVICE_ID_RARITAN_KVM_DONGLE, HID_QUIRK_NOGET },
64
64
{ USB_VENDOR_ID_TURBOX, USB_DEVICE_ID_TURBOX_KEYBOARD, HID_QUIRK_NOGET },
65
65
{ USB_VENDOR_ID_UCLOGIC, USB_DEVICE_ID_UCLOGIC_TABLET_PF1209, HID_QUIRK_MULTI_INPUT },
66
+
{ USB_VENDOR_ID_UCLOGIC, USB_DEVICE_ID_UCLOGIC_TABLET_WP4030U, HID_QUIRK_MULTI_INPUT },
66
67
{ USB_VENDOR_ID_WISEGROUP, USB_DEVICE_ID_DUAL_USB_JOYPAD, HID_QUIRK_NOGET | HID_QUIRK_MULTI_INPUT | HID_QUIRK_SKIP_OUTPUT_REPORTS },
67
68
{ USB_VENDOR_ID_WISEGROUP, USB_DEVICE_ID_QUAD_USB_JOYPAD, HID_QUIRK_NOGET | HID_QUIRK_MULTI_INPUT },
68
69