diff options
author | Ian Abbott <abbotti@mev.co.uk> | 2013-02-13 08:22:45 -0500 |
---|---|---|
committer | Jiri Kosina <jkosina@suse.cz> | 2013-02-18 04:35:46 -0500 |
commit | 30b6b7d8d340f41d11eb75e5238d33dbc438fde4 (patch) | |
tree | 030c626e5812a1c4929f1ba892bb89be77bf8724 /drivers | |
parent | e7e2b788614c453c72550264bd915ba8923218e8 (diff) |
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 <abbotti@mev.co.uk>
Signed-off-by: Jiri Kosina <jkosina@suse.cz>
Diffstat (limited to 'drivers')
-rw-r--r-- | drivers/hid/hid-core.c | 8 | ||||
-rw-r--r-- | drivers/hid/hid-ids.h | 6 |
2 files changed, 14 insertions, 0 deletions
diff --git a/drivers/hid/hid-core.c b/drivers/hid/hid-core.c index aad262727300..bf44af35439b 100644 --- a/drivers/hid/hid-core.c +++ b/drivers/hid/hid-core.c | |||
@@ -2229,6 +2229,14 @@ bool hid_ignore(struct hid_device *hdev) | |||
2229 | hdev->type != HID_TYPE_USBMOUSE) | 2229 | hdev->type != HID_TYPE_USBMOUSE) |
2230 | return true; | 2230 | return true; |
2231 | break; | 2231 | break; |
2232 | case USB_VENDOR_ID_VELLEMAN: | ||
2233 | /* These are not HID devices. They are handled by comedi. */ | ||
2234 | if ((hdev->product >= USB_DEVICE_ID_VELLEMAN_K8055_FIRST && | ||
2235 | hdev->product <= USB_DEVICE_ID_VELLEMAN_K8055_LAST) || | ||
2236 | (hdev->product >= USB_DEVICE_ID_VELLEMAN_K8061_FIRST && | ||
2237 | hdev->product <= USB_DEVICE_ID_VELLEMAN_K8061_LAST)) | ||
2238 | return true; | ||
2239 | break; | ||
2232 | } | 2240 | } |
2233 | 2241 | ||
2234 | if (hdev->type == HID_TYPE_USBMOUSE && | 2242 | if (hdev->type == HID_TYPE_USBMOUSE && |
diff --git a/drivers/hid/hid-ids.h b/drivers/hid/hid-ids.h index 3a493345ded0..104105208596 100644 --- a/drivers/hid/hid-ids.h +++ b/drivers/hid/hid-ids.h | |||
@@ -794,6 +794,12 @@ | |||
794 | #define USB_DEVICE_ID_UNITEC_USB_TOUCH_0709 0x0709 | 794 | #define USB_DEVICE_ID_UNITEC_USB_TOUCH_0709 0x0709 |
795 | #define USB_DEVICE_ID_UNITEC_USB_TOUCH_0A19 0x0a19 | 795 | #define USB_DEVICE_ID_UNITEC_USB_TOUCH_0A19 0x0a19 |
796 | 796 | ||
797 | #define USB_VENDOR_ID_VELLEMAN 0x10cf | ||
798 | #define USB_DEVICE_ID_VELLEMAN_K8055_FIRST 0x5500 | ||
799 | #define USB_DEVICE_ID_VELLEMAN_K8055_LAST 0x5503 | ||
800 | #define USB_DEVICE_ID_VELLEMAN_K8061_FIRST 0x8061 | ||
801 | #define USB_DEVICE_ID_VELLEMAN_K8061_LAST 0x8068 | ||
802 | |||
797 | #define USB_VENDOR_ID_VERNIER 0x08f7 | 803 | #define USB_VENDOR_ID_VERNIER 0x08f7 |
798 | #define USB_DEVICE_ID_VERNIER_LABPRO 0x0001 | 804 | #define USB_DEVICE_ID_VERNIER_LABPRO 0x0001 |
799 | #define USB_DEVICE_ID_VERNIER_GOTEMP 0x0002 | 805 | #define USB_DEVICE_ID_VERNIER_GOTEMP 0x0002 |