Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 25364a9e authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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
parents 357436af 2078665a

drivers/hid/hid-ids.h

+1 −0
Original line number Diff line number Diff line
@@ -609,6 +609,7 @@ 
#define USB_DEVICE_ID_LOGITECH_HARMONY_FIRST  0xc110

#define USB_DEVICE_ID_LOGITECH_HARMONY_LAST 0xc14f

#define USB_DEVICE_ID_LOGITECH_HARMONY_PS3 0x0306

#define USB_DEVICE_ID_LOGITECH_KEYBOARD_G710_PLUS 0xc24d

#define USB_DEVICE_ID_LOGITECH_MOUSE_C01A	0xc01a

#define USB_DEVICE_ID_LOGITECH_MOUSE_C05A	0xc05a

#define USB_DEVICE_ID_LOGITECH_MOUSE_C06A	0xc06a

drivers/hid/hid-lg.c

+3 −2
Original line number Diff line number Diff line
@@ -665,8 +665,9 @@ static int lg_probe(struct hid_device *hdev, const struct hid_device_id *id) 
	struct lg_drv_data *drv_data;

	int ret;



	/* Only work with the 1st interface (G29 presents multiple) */

	if (iface_num != 0) {

	/* G29 only work with the 1st interface */

	if ((hdev->product == USB_DEVICE_ID_LOGITECH_G29_WHEEL) &&

	    (iface_num != 0)) {

		dbg_hid("%s: ignoring ifnum %d\n", __func__, iface_num);

		return -ENODEV;

	}

drivers/hid/usbhid/hid-quirks.c

+1 −0
Original line number Diff line number Diff line
@@ -84,6 +84,7 @@ static const struct hid_blacklist { 
	{ USB_VENDOR_ID_HP, USB_PRODUCT_ID_HP_LOGITECH_OEM_USB_OPTICAL_MOUSE_0B4A, HID_QUIRK_ALWAYS_POLL },

	{ USB_VENDOR_ID_HP, USB_PRODUCT_ID_HP_PIXART_OEM_USB_OPTICAL_MOUSE, HID_QUIRK_ALWAYS_POLL },

	{ USB_VENDOR_ID_LOGITECH, USB_DEVICE_ID_LOGITECH_C077, HID_QUIRK_ALWAYS_POLL },

	{ USB_VENDOR_ID_LOGITECH, USB_DEVICE_ID_LOGITECH_KEYBOARD_G710_PLUS, HID_QUIRK_NOGET },

	{ USB_VENDOR_ID_LOGITECH, USB_DEVICE_ID_LOGITECH_MOUSE_C01A, HID_QUIRK_ALWAYS_POLL },

	{ USB_VENDOR_ID_LOGITECH, USB_DEVICE_ID_LOGITECH_MOUSE_C05A, HID_QUIRK_ALWAYS_POLL },

	{ USB_VENDOR_ID_LOGITECH, USB_DEVICE_ID_LOGITECH_MOUSE_C06A, HID_QUIRK_ALWAYS_POLL },