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:
- regression fix for hid-lg driver from Benjamin Tissoires
- quirk for Logitech G710+ from Jimmy Berry
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid:
HID: lg: restrict filtering out of first interface to G29 only
HID: usbhid: add Logitech G710+ keyboard quirk NOGET
+5
-2
+1
drivers/hid/hid-ids.h
+1
drivers/hid/hid-ids.h
···
609
609
#define USB_DEVICE_ID_LOGITECH_HARMONY_FIRST 0xc110
610
610
#define USB_DEVICE_ID_LOGITECH_HARMONY_LAST 0xc14f
611
611
#define USB_DEVICE_ID_LOGITECH_HARMONY_PS3 0x0306
612
+
#define USB_DEVICE_ID_LOGITECH_KEYBOARD_G710_PLUS 0xc24d
612
613
#define USB_DEVICE_ID_LOGITECH_MOUSE_C01A 0xc01a
613
614
#define USB_DEVICE_ID_LOGITECH_MOUSE_C05A 0xc05a
614
615
#define USB_DEVICE_ID_LOGITECH_MOUSE_C06A 0xc06a
+3
-2
drivers/hid/hid-lg.c
+3
-2
drivers/hid/hid-lg.c
···
665
665
struct lg_drv_data *drv_data;
666
666
int ret;
667
667
668
-
/* Only work with the 1st interface (G29 presents multiple) */
669
-
if (iface_num != 0) {
668
+
/* G29 only work with the 1st interface */
669
+
if ((hdev->product == USB_DEVICE_ID_LOGITECH_G29_WHEEL) &&
670
+
(iface_num != 0)) {
670
671
dbg_hid("%s: ignoring ifnum %d\n", __func__, iface_num);
671
672
return -ENODEV;
672
673
}
+1
drivers/hid/usbhid/hid-quirks.c
+1
drivers/hid/usbhid/hid-quirks.c
···
84
84
{ USB_VENDOR_ID_HP, USB_PRODUCT_ID_HP_LOGITECH_OEM_USB_OPTICAL_MOUSE_0B4A, HID_QUIRK_ALWAYS_POLL },
85
85
{ USB_VENDOR_ID_HP, USB_PRODUCT_ID_HP_PIXART_OEM_USB_OPTICAL_MOUSE, HID_QUIRK_ALWAYS_POLL },
86
86
{ USB_VENDOR_ID_LOGITECH, USB_DEVICE_ID_LOGITECH_C077, HID_QUIRK_ALWAYS_POLL },
87
+
{ USB_VENDOR_ID_LOGITECH, USB_DEVICE_ID_LOGITECH_KEYBOARD_G710_PLUS, HID_QUIRK_NOGET },
87
88
{ USB_VENDOR_ID_LOGITECH, USB_DEVICE_ID_LOGITECH_MOUSE_C01A, HID_QUIRK_ALWAYS_POLL },
88
89
{ USB_VENDOR_ID_LOGITECH, USB_DEVICE_ID_LOGITECH_MOUSE_C05A, HID_QUIRK_ALWAYS_POLL },
89
90
{ USB_VENDOR_ID_LOGITECH, USB_DEVICE_ID_LOGITECH_MOUSE_C06A, HID_QUIRK_ALWAYS_POLL },