HID: blacklist Velleman data acquisition boards

These are simple data acquistion boards, not HID devices and are handled by the vmk80xx comedi driver. At least one of them (10cf:5500) misidentifies itself as a HID in its USB interface descriptor. Ignore all these devices. Signed-off-by: Ian Abbott <[email protected]> Signed-off-by: Jiri Kosina <[email protected]>
primiano · Feb 18, 2013 · 30b6b7d · 30b6b7d
1 parent e7e2b78
commit 30b6b7d
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 0 deletions.
diff --git a/drivers/hid/hid-core.c b/drivers/hid/hid-core.c
@@ -2229,6 +2229,14 @@ bool hid_ignore(struct hid_device *hdev)
  hdev->type != HID_TYPE_USBMOUSE)
  return true;
  break;
+ case USB_VENDOR_ID_VELLEMAN:
+ /* These are not HID devices. They are handled by comedi. */
+ if ((hdev->product >= USB_DEVICE_ID_VELLEMAN_K8055_FIRST &&
+ hdev->product <= USB_DEVICE_ID_VELLEMAN_K8055_LAST) ||
+ (hdev->product >= USB_DEVICE_ID_VELLEMAN_K8061_FIRST &&
+ hdev->product <= USB_DEVICE_ID_VELLEMAN_K8061_LAST))
+ return true;
+ break;
  }
 
  if (hdev->type == HID_TYPE_USBMOUSE &&

diff --git a/drivers/hid/hid-ids.h b/drivers/hid/hid-ids.h
@@ -794,6 +794,12 @@
 #define USB_DEVICE_ID_UNITEC_USB_TOUCH_0709 0x0709
 #define USB_DEVICE_ID_UNITEC_USB_TOUCH_0A19 0x0a19
 
+#define USB_VENDOR_ID_VELLEMAN 0x10cf
+#define USB_DEVICE_ID_VELLEMAN_K8055_FIRST 0x5500
+#define USB_DEVICE_ID_VELLEMAN_K8055_LAST 0x5503
+#define USB_DEVICE_ID_VELLEMAN_K8061_FIRST 0x8061
+#define USB_DEVICE_ID_VELLEMAN_K8061_LAST 0x8068
+
 #define USB_VENDOR_ID_VERNIER 0x08f7
 #define USB_DEVICE_ID_VERNIER_LABPRO 0x0001
 #define USB_DEVICE_ID_VERNIER_GOTEMP 0x0002