diff options
| -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 |
