Commit a4f1cb9f 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 

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid:
  HID: add NOGET quirk for devices from CH Products
  HID: fix dropped device-specific quirks
parents bd99f5e1 b820aabf

drivers/hid/hid-ids.h

+5 −0
Original line number Diff line number Diff line
@@ -113,6 +113,11 @@ 
#define USB_VENDOR_ID_BERKSHIRE		0x0c98

#define USB_DEVICE_ID_BERKSHIRE_PCWD	0x1140



#define USB_VENDOR_ID_CH		0x068e

#define USB_DEVICE_ID_CH_PRO_PEDALS	0x00f2

#define USB_DEVICE_ID_CH_COMBATSTICK	0x00f4

#define USB_DEVICE_ID_CH_FLIGHT_SIM_YOKE	0x00ff



#define USB_VENDOR_ID_CHERRY		0x046a

#define USB_DEVICE_ID_CHERRY_CYMOTION	0x0023

drivers/hid/usbhid/hid-core.c

+1 −1
Original line number Diff line number Diff line
@@ -898,7 +898,7 @@ static int usbhid_parse(struct hid_device *hid) 
		goto err;

	}



	hid->quirks = quirks;

	hid->quirks |= quirks;



	return 0;

err:

drivers/hid/usbhid/hid-quirks.c

+3 −0
Original line number Diff line number Diff line
@@ -50,6 +50,9 @@ static const struct hid_blacklist { 
	{ USB_VENDOR_ID_ATEN, USB_DEVICE_ID_ATEN_2PORTKVM, HID_QUIRK_NOGET },

	{ USB_VENDOR_ID_ATEN, USB_DEVICE_ID_ATEN_4PORTKVM, HID_QUIRK_NOGET },

	{ USB_VENDOR_ID_ATEN, USB_DEVICE_ID_ATEN_4PORTKVMC, HID_QUIRK_NOGET },

	{ USB_VENDOR_ID_CH, USB_DEVICE_ID_CH_COMBATSTICK, HID_QUIRK_NOGET },

	{ USB_VENDOR_ID_CH, USB_DEVICE_ID_CH_FLIGHT_SIM_YOKE, HID_QUIRK_NOGET },

	{ USB_VENDOR_ID_CH, USB_DEVICE_ID_CH_PRO_PEDALS, HID_QUIRK_NOGET },

	{ USB_VENDOR_ID_DMI, USB_DEVICE_ID_DMI_ENC, HID_QUIRK_NOGET },

	{ USB_VENDOR_ID_ELO, USB_DEVICE_ID_ELO_TS2700, HID_QUIRK_NOGET },

	{ USB_VENDOR_ID_SUN, USB_DEVICE_ID_RARITAN_KVM_DONGLE, HID_QUIRK_NOGET },