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

Commit d458a9df authored by Jiri Slaby's avatar Jiri Slaby Committed by Jiri Kosina
Browse files

HID: move ignore quirks 



Move ignore quirks from usbhid-quirks into hid-core code. Also don't output
warning when ENODEV is error code in usbhid and try ordinal input in hidp
when that error is returned.

Signed-off-by: default avatarJiri Slaby <jslaby@suse.cz>
Signed-off-by: default avatarJiri Kosina <jkosina@suse.cz>
parent 5f22a799

drivers/hid/hid-core.c

+163 −0
Original line number Diff line number Diff line
@@ -1237,6 +1237,164 @@ static struct bus_type hid_bus_type = { 
	.uevent		= hid_uevent,

};



static const struct hid_device_id hid_ignore_list[] = {

	{ HID_USB_DEVICE(USB_VENDOR_ID_ACECAD, USB_DEVICE_ID_ACECAD_FLAIR) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_ACECAD, USB_DEVICE_ID_ACECAD_302) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_ADS_TECH, USB_DEVICE_ID_ADS_TECH_RADIO_SI470X) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_AIPTEK, USB_DEVICE_ID_AIPTEK_01) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_AIPTEK, USB_DEVICE_ID_AIPTEK_10) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_AIPTEK, USB_DEVICE_ID_AIPTEK_20) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_AIPTEK, USB_DEVICE_ID_AIPTEK_21) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_AIPTEK, USB_DEVICE_ID_AIPTEK_22) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_AIPTEK, USB_DEVICE_ID_AIPTEK_23) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_AIPTEK, USB_DEVICE_ID_AIPTEK_24) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_AIRCABLE, USB_DEVICE_ID_AIRCABLE1) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_ALCOR, USB_DEVICE_ID_ALCOR_USBRS232) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_ASUS, USB_DEVICE_ID_ASUS_LCM)},

	{ HID_USB_DEVICE(USB_VENDOR_ID_BERKSHIRE, USB_DEVICE_ID_BERKSHIRE_PCWD) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_CIDC, 0x0103) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_CYGNAL, USB_DEVICE_ID_CYGNAL_RADIO_SI470X) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_CMEDIA, USB_DEVICE_ID_CM109) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_CYPRESS, USB_DEVICE_ID_CYPRESS_HIDCOM) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_CYPRESS, USB_DEVICE_ID_CYPRESS_ULTRAMOUSE) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_DELORME, USB_DEVICE_ID_DELORME_EARTHMATE) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_DELORME, USB_DEVICE_ID_DELORME_EM_LT20) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_ESSENTIAL_REALITY, USB_DEVICE_ID_ESSENTIAL_REALITY_P5) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_GENERAL_TOUCH, 0x0001) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_GENERAL_TOUCH, 0x0002) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_GENERAL_TOUCH, 0x0003) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_GENERAL_TOUCH, 0x0004) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_GLAB, USB_DEVICE_ID_4_PHIDGETSERVO_30) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_GLAB, USB_DEVICE_ID_1_PHIDGETSERVO_30) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_GLAB, USB_DEVICE_ID_0_0_4_IF_KIT) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_GLAB, USB_DEVICE_ID_0_16_16_IF_KIT) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_GLAB, USB_DEVICE_ID_8_8_8_IF_KIT) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_GLAB, USB_DEVICE_ID_0_8_7_IF_KIT) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_GLAB, USB_DEVICE_ID_0_8_8_IF_KIT) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_GLAB, USB_DEVICE_ID_PHIDGET_MOTORCONTROL) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_GOTOP, USB_DEVICE_ID_SUPER_Q2) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_GOTOP, USB_DEVICE_ID_GOGOPEN) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_GOTOP, USB_DEVICE_ID_PENPOWER) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_GRETAGMACBETH, USB_DEVICE_ID_GRETAGMACBETH_HUEY) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_GRIFFIN, USB_DEVICE_ID_POWERMATE) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_GRIFFIN, USB_DEVICE_ID_SOUNDKNOB) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_GTCO, USB_DEVICE_ID_GTCO_90) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_GTCO, USB_DEVICE_ID_GTCO_100) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_GTCO, USB_DEVICE_ID_GTCO_101) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_GTCO, USB_DEVICE_ID_GTCO_103) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_GTCO, USB_DEVICE_ID_GTCO_104) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_GTCO, USB_DEVICE_ID_GTCO_105) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_GTCO, USB_DEVICE_ID_GTCO_106) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_GTCO, USB_DEVICE_ID_GTCO_107) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_GTCO, USB_DEVICE_ID_GTCO_108) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_GTCO, USB_DEVICE_ID_GTCO_200) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_GTCO, USB_DEVICE_ID_GTCO_201) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_GTCO, USB_DEVICE_ID_GTCO_202) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_GTCO, USB_DEVICE_ID_GTCO_203) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_GTCO, USB_DEVICE_ID_GTCO_204) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_GTCO, USB_DEVICE_ID_GTCO_205) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_GTCO, USB_DEVICE_ID_GTCO_206) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_GTCO, USB_DEVICE_ID_GTCO_207) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_GTCO, USB_DEVICE_ID_GTCO_300) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_GTCO, USB_DEVICE_ID_GTCO_301) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_GTCO, USB_DEVICE_ID_GTCO_302) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_GTCO, USB_DEVICE_ID_GTCO_303) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_GTCO, USB_DEVICE_ID_GTCO_304) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_GTCO, USB_DEVICE_ID_GTCO_305) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_GTCO, USB_DEVICE_ID_GTCO_306) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_GTCO, USB_DEVICE_ID_GTCO_307) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_GTCO, USB_DEVICE_ID_GTCO_308) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_GTCO, USB_DEVICE_ID_GTCO_309) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_GTCO, USB_DEVICE_ID_GTCO_400) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_GTCO, USB_DEVICE_ID_GTCO_401) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_GTCO, USB_DEVICE_ID_GTCO_402) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_GTCO, USB_DEVICE_ID_GTCO_403) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_GTCO, USB_DEVICE_ID_GTCO_404) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_GTCO, USB_DEVICE_ID_GTCO_405) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_GTCO, USB_DEVICE_ID_GTCO_500) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_GTCO, USB_DEVICE_ID_GTCO_501) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_GTCO, USB_DEVICE_ID_GTCO_502) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_GTCO, USB_DEVICE_ID_GTCO_503) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_GTCO, USB_DEVICE_ID_GTCO_504) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_GTCO, USB_DEVICE_ID_GTCO_1000) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_GTCO, USB_DEVICE_ID_GTCO_1001) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_GTCO, USB_DEVICE_ID_GTCO_1002) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_GTCO, USB_DEVICE_ID_GTCO_1003) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_GTCO, USB_DEVICE_ID_GTCO_1004) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_GTCO, USB_DEVICE_ID_GTCO_1005) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_GTCO, USB_DEVICE_ID_GTCO_1006) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_GTCO, USB_DEVICE_ID_GTCO_1007) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_IMATION, USB_DEVICE_ID_DISC_STAKKA) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_KBGEAR, USB_DEVICE_ID_KBGEAR_JAMSTUDIO) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_KYE, USB_DEVICE_ID_KYE_GPEN_560) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_LD, USB_DEVICE_ID_LD_CASSY) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_LD, USB_DEVICE_ID_LD_POCKETCASSY) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_LD, USB_DEVICE_ID_LD_MOBILECASSY) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_LD, USB_DEVICE_ID_LD_JWM) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_LD, USB_DEVICE_ID_LD_DMMP) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_LD, USB_DEVICE_ID_LD_UMIP) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_LD, USB_DEVICE_ID_LD_XRAY1) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_LD, USB_DEVICE_ID_LD_XRAY2) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_LD, USB_DEVICE_ID_LD_VIDEOCOM) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_LD, USB_DEVICE_ID_LD_COM3LAB) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_LD, USB_DEVICE_ID_LD_TELEPORT) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_LD, USB_DEVICE_ID_LD_NETWORKANALYSER) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_LD, USB_DEVICE_ID_LD_POWERCONTROL) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_LD, USB_DEVICE_ID_LD_MACHINETEST) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_MCC, USB_DEVICE_ID_MCC_PMD1024LS) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_MCC, USB_DEVICE_ID_MCC_PMD1208LS) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_MGE, USB_DEVICE_ID_MGE_UPS) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_MGE, USB_DEVICE_ID_MGE_UPS1) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_MICROCHIP, USB_DEVICE_ID_PICKIT1) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_MICROCHIP, USB_DEVICE_ID_PICKIT2) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_NATIONAL_SEMICONDUCTOR, USB_DEVICE_ID_N_S_HARMONY) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_ONTRAK, USB_DEVICE_ID_ONTRAK_ADU100) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_ONTRAK, USB_DEVICE_ID_ONTRAK_ADU100 + 20) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_ONTRAK, USB_DEVICE_ID_ONTRAK_ADU100 + 30) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_ONTRAK, USB_DEVICE_ID_ONTRAK_ADU100 + 100) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_ONTRAK, USB_DEVICE_ID_ONTRAK_ADU100 + 108) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_ONTRAK, USB_DEVICE_ID_ONTRAK_ADU100 + 118) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_ONTRAK, USB_DEVICE_ID_ONTRAK_ADU100 + 200) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_ONTRAK, USB_DEVICE_ID_ONTRAK_ADU100 + 300) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_ONTRAK, USB_DEVICE_ID_ONTRAK_ADU100 + 400) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_ONTRAK, USB_DEVICE_ID_ONTRAK_ADU100 + 500) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_PANJIT, 0x0001) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_PANJIT, 0x0002) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_PANJIT, 0x0003) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_PANJIT, 0x0004) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_SOUNDGRAPH, USB_DEVICE_ID_SOUNDGRAPH_IMON_LCD) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_VERNIER, USB_DEVICE_ID_VERNIER_LABPRO) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_VERNIER, USB_DEVICE_ID_VERNIER_GOTEMP) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_VERNIER, USB_DEVICE_ID_VERNIER_SKIP) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_VERNIER, USB_DEVICE_ID_VERNIER_CYCLOPS) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_VERNIER, USB_DEVICE_ID_VERNIER_LCSPEC) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_WACOM, HID_ANY_ID) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_WISEGROUP, USB_DEVICE_ID_4_PHIDGETSERVO_20) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_WISEGROUP, USB_DEVICE_ID_1_PHIDGETSERVO_20) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_WISEGROUP, USB_DEVICE_ID_8_8_4_IF_KIT) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_YEALINK, USB_DEVICE_ID_YEALINK_P1K_P4K_B2K) },

	{ }

};



static bool hid_ignore(struct hid_device *hdev)

{

	switch (hdev->vendor) {

	case USB_VENDOR_ID_CODEMERCS:

		/* ignore all Code Mercenaries IOWarrior devices */

		if (hdev->product >= USB_DEVICE_ID_CODEMERCS_IOW_FIRST &&

				hdev->product <= USB_DEVICE_ID_CODEMERCS_IOW_LAST)

			return true;

		break;

	case USB_VENDOR_ID_LOGITECH:

		if (hdev->product >= USB_DEVICE_ID_LOGITECH_HARMONY_FIRST &&

				hdev->product <= USB_DEVICE_ID_LOGITECH_HARMONY_LAST)

			return true;

		break;

	}



	return !!hid_match_id(hdev, hid_ignore_list);

}



int hid_add_device(struct hid_device *hdev)

{

	static atomic_t id = ATOMIC_INIT(0);
@@ -1245,6 +1403,11 @@ int hid_add_device(struct hid_device *hdev) 
	if (WARN_ON(hdev->status & HID_STAT_ADDED))

		return -EBUSY;



	/* we need to kill them here, otherwise they will stay allocated to

	 * wait for coming driver */

	if (hid_ignore(hdev))

		return -ENODEV;



	/* XXX hack, any other cleaner solution < 20 bus_id bytes? */

	sprintf(hdev->dev.bus_id, "%04X:%04X:%04X.%04X", hdev->bus,

			hdev->vendor, hdev->product, atomic_inc_return(&id));

drivers/hid/hid-ids.h

+2 −64
Original line number Diff line number Diff line
@@ -251,70 +251,8 @@ 
#define USB_DEVICE_ID_LOGITECH_LX3	0xc044

#define USB_DEVICE_ID_LOGITECH_V150	0xc047

#define USB_DEVICE_ID_LOGITECH_RECEIVER	0xc101

#define USB_DEVICE_ID_LOGITECH_HARMONY  0xc110

#define USB_DEVICE_ID_LOGITECH_HARMONY_2 0xc111

#define USB_DEVICE_ID_LOGITECH_HARMONY_3 0xc112

#define USB_DEVICE_ID_LOGITECH_HARMONY_4 0xc113

#define USB_DEVICE_ID_LOGITECH_HARMONY_5 0xc114

#define USB_DEVICE_ID_LOGITECH_HARMONY_6 0xc115

#define USB_DEVICE_ID_LOGITECH_HARMONY_7 0xc116

#define USB_DEVICE_ID_LOGITECH_HARMONY_8 0xc117

#define USB_DEVICE_ID_LOGITECH_HARMONY_9 0xc118

#define USB_DEVICE_ID_LOGITECH_HARMONY_10 0xc119

#define USB_DEVICE_ID_LOGITECH_HARMONY_11 0xc11a

#define USB_DEVICE_ID_LOGITECH_HARMONY_12 0xc11b

#define USB_DEVICE_ID_LOGITECH_HARMONY_13 0xc11c

#define USB_DEVICE_ID_LOGITECH_HARMONY_14 0xc11d

#define USB_DEVICE_ID_LOGITECH_HARMONY_15 0xc11e

#define USB_DEVICE_ID_LOGITECH_HARMONY_16 0xc11f

#define USB_DEVICE_ID_LOGITECH_HARMONY_17 0xc120

#define USB_DEVICE_ID_LOGITECH_HARMONY_18 0xc121

#define USB_DEVICE_ID_LOGITECH_HARMONY_19 0xc122

#define USB_DEVICE_ID_LOGITECH_HARMONY_20 0xc123

#define USB_DEVICE_ID_LOGITECH_HARMONY_21 0xc124

#define USB_DEVICE_ID_LOGITECH_HARMONY_22 0xc125

#define USB_DEVICE_ID_LOGITECH_HARMONY_23 0xc126

#define USB_DEVICE_ID_LOGITECH_HARMONY_24 0xc127

#define USB_DEVICE_ID_LOGITECH_HARMONY_25 0xc128

#define USB_DEVICE_ID_LOGITECH_HARMONY_26 0xc129

#define USB_DEVICE_ID_LOGITECH_HARMONY_27 0xc12a

#define USB_DEVICE_ID_LOGITECH_HARMONY_28 0xc12b

#define USB_DEVICE_ID_LOGITECH_HARMONY_29 0xc12c

#define USB_DEVICE_ID_LOGITECH_HARMONY_30 0xc12d

#define USB_DEVICE_ID_LOGITECH_HARMONY_31 0xc12e

#define USB_DEVICE_ID_LOGITECH_HARMONY_32 0xc12f

#define USB_DEVICE_ID_LOGITECH_HARMONY_33 0xc130

#define USB_DEVICE_ID_LOGITECH_HARMONY_34 0xc131

#define USB_DEVICE_ID_LOGITECH_HARMONY_35 0xc132

#define USB_DEVICE_ID_LOGITECH_HARMONY_36 0xc133

#define USB_DEVICE_ID_LOGITECH_HARMONY_37 0xc134

#define USB_DEVICE_ID_LOGITECH_HARMONY_38 0xc135

#define USB_DEVICE_ID_LOGITECH_HARMONY_39 0xc136

#define USB_DEVICE_ID_LOGITECH_HARMONY_40 0xc137

#define USB_DEVICE_ID_LOGITECH_HARMONY_41 0xc138

#define USB_DEVICE_ID_LOGITECH_HARMONY_42 0xc139

#define USB_DEVICE_ID_LOGITECH_HARMONY_43 0xc13a

#define USB_DEVICE_ID_LOGITECH_HARMONY_44 0xc13b

#define USB_DEVICE_ID_LOGITECH_HARMONY_45 0xc13c

#define USB_DEVICE_ID_LOGITECH_HARMONY_46 0xc13d

#define USB_DEVICE_ID_LOGITECH_HARMONY_47 0xc13e

#define USB_DEVICE_ID_LOGITECH_HARMONY_48 0xc13f

#define USB_DEVICE_ID_LOGITECH_HARMONY_49 0xc140

#define USB_DEVICE_ID_LOGITECH_HARMONY_50 0xc141

#define USB_DEVICE_ID_LOGITECH_HARMONY_51 0xc142

#define USB_DEVICE_ID_LOGITECH_HARMONY_52 0xc143

#define USB_DEVICE_ID_LOGITECH_HARMONY_53 0xc144

#define USB_DEVICE_ID_LOGITECH_HARMONY_54 0xc145

#define USB_DEVICE_ID_LOGITECH_HARMONY_55 0xc146

#define USB_DEVICE_ID_LOGITECH_HARMONY_56 0xc147

#define USB_DEVICE_ID_LOGITECH_HARMONY_57 0xc148

#define USB_DEVICE_ID_LOGITECH_HARMONY_58 0xc149

#define USB_DEVICE_ID_LOGITECH_HARMONY_59 0xc14a

#define USB_DEVICE_ID_LOGITECH_HARMONY_60 0xc14b

#define USB_DEVICE_ID_LOGITECH_HARMONY_61 0xc14c

#define USB_DEVICE_ID_LOGITECH_HARMONY_62 0xc14d

#define USB_DEVICE_ID_LOGITECH_HARMONY_63 0xc14e

#define USB_DEVICE_ID_LOGITECH_HARMONY_64 0xc14f

#define USB_DEVICE_ID_LOGITECH_HARMONY_FIRST  0xc110

#define USB_DEVICE_ID_LOGITECH_HARMONY_LAST 0xc14f

#define USB_DEVICE_ID_LOGITECH_EXTREME_3D	0xc215

#define USB_DEVICE_ID_LOGITECH_WHEEL	0xc294

#define USB_DEVICE_ID_LOGITECH_ELITE_KBD	0xc30a

drivers/hid/usbhid/hid-core.c

+2 −4
Original line number Diff line number Diff line
@@ -791,9 +791,6 @@ static int usbhid_parse(struct hid_device *hid) 
				quirks |= HID_QUIRK_NOGET;

	}



	if (quirks & HID_QUIRK_IGNORE)

		return -ENODEV;



	if ((quirks & HID_QUIRK_IGNORE_MOUSE) &&

		(interface->desc.bInterfaceProtocol == USB_INTERFACE_PROTOCOL_MOUSE))

			return -ENODEV;
@@ -1082,6 +1079,7 @@ static int hid_probe(struct usb_interface *intf, const struct usb_device_id *id) 


	ret = hid_add_device(hid);

	if (ret) {

		if (ret != -ENODEV)

			dev_err(&intf->dev, "can't add hid device: %d\n", ret);

		goto err;

	}

drivers/hid/usbhid/hid-quirks.c

+0 −210

File changed.

Preview size limit exceeded, changes collapsed.

include/linux/hid.h

+0 −1
Original line number Diff line number Diff line
@@ -257,7 +257,6 @@ struct hid_item { 


#define HID_QUIRK_INVERT			0x00000001

#define HID_QUIRK_NOTOUCH			0x00000002

#define HID_QUIRK_IGNORE			0x00000004

#define HID_QUIRK_NOGET				0x00000008

#define HID_QUIRK_HIDDEV			0x00000010

#define HID_QUIRK_BADPAD			0x00000020