Commit 31f7fd79 authored by Jarod Wilson's avatar Jarod Wilson Committed by Jiri Kosina
Browse files

HID: ignore all recent SoundGraph iMON devices 



After some inspection of the Windows iMON driver, several additional
device IDs were added to the lirc_imon driver. At least a few of these
have been seen in the wild, and require manual quirking to keep the
usbhid driver from binding to them. Rather than list out every single
device, ignore the entire device ID range, 0x0034 - 0x0046. Some of
these may not advertise themselves as HID devices, but no harm done to
such devices anyway. Does the right thing in brief testing w/my 0x0045
device.

Signed-off-by: default avatarJarod Wilson <jarod@redhat.com>
Acked-by: default avatarAnssi Hannula <anssi.hannula@gmail.com>
Signed-off-by: default avatarJiri Kosina <jkosina@suse.cz>
parent 3040c820

drivers/hid/hid-core.c

+5 −5
Original line number Diff line number Diff line
@@ -1627,11 +1627,6 @@ static const struct hid_device_id hid_ignore_list[] = { 
	{ HID_USB_DEVICE(USB_VENDOR_ID_PANJIT, 0x0003) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_PANJIT, 0x0004) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_POWERCOM, USB_DEVICE_ID_POWERCOM_UPS) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_SOUNDGRAPH, USB_DEVICE_ID_SOUNDGRAPH_IMON_LCD) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_SOUNDGRAPH, USB_DEVICE_ID_SOUNDGRAPH_IMON_LCD2) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_SOUNDGRAPH, USB_DEVICE_ID_SOUNDGRAPH_IMON_LCD3) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_SOUNDGRAPH, USB_DEVICE_ID_SOUNDGRAPH_IMON_LCD4) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_SOUNDGRAPH, USB_DEVICE_ID_SOUNDGRAPH_IMON_LCD5) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_TENX, USB_DEVICE_ID_TENX_IBUDDY1) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_TENX, USB_DEVICE_ID_TENX_IBUDDY2) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_VERNIER, USB_DEVICE_ID_VERNIER_LABPRO) },
@@ -1698,6 +1693,11 @@ static bool hid_ignore(struct hid_device *hdev) 
				hdev->product <= USB_DEVICE_ID_LOGITECH_HARMONY_LAST)

			return true;

		break;

	case USB_VENDOR_ID_SOUNDGRAPH:

		if (hdev->product >= USB_DEVICE_ID_SOUNDGRAPH_IMON_FIRST &&

		    hdev->product <= USB_DEVICE_ID_SOUNDGRAPH_IMON_LAST)

			return true;

		break;

	}



	if (hdev->type == HID_TYPE_USBMOUSE &&

drivers/hid/hid-ids.h

+2 −5
Original line number Diff line number Diff line
@@ -377,11 +377,8 @@ 
#define USB_DEVICE_ID_SONY_PS3_CONTROLLER	0x0268



#define USB_VENDOR_ID_SOUNDGRAPH	0x15c2

#define USB_DEVICE_ID_SOUNDGRAPH_IMON_LCD	0x0038

#define USB_DEVICE_ID_SOUNDGRAPH_IMON_LCD2	0x0036

#define USB_DEVICE_ID_SOUNDGRAPH_IMON_LCD3	0x0034

#define USB_DEVICE_ID_SOUNDGRAPH_IMON_LCD4	0x0044

#define USB_DEVICE_ID_SOUNDGRAPH_IMON_LCD5	0x0045

#define USB_DEVICE_ID_SOUNDGRAPH_IMON_FIRST	0x0034

#define USB_DEVICE_ID_SOUNDGRAPH_IMON_LAST	0x0046



#define USB_VENDOR_ID_SUN		0x0430

#define USB_DEVICE_ID_RARITAN_KVM_DONGLE	0xcdab

CRA Git | Maintained and supported by SUSTech CRA and CCSE