aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlfred E. Heggestad <aeh@db.org>2007-08-29 09:53:03 -0400
committerJiri Kosina <jkosina@suse.cz>2007-10-14 07:40:01 -0400
commitc4025aded3eab4a50d5070d96ae3a46a25bdc59d (patch)
tree931968780f73bcad080b04d2ad62dc2fdf90c466
parentc01d50d181f074a60bf3ed54eb055ce1679afb98 (diff)
USBHID: add CM109 device to blacklist
There is a separate driver cm109 for handling this device. Signed-off-by: Alfred E. Heggestad <aeh@db.org> Signed-off-by: Jiri Kosina <jkosina@suse.cz>
-rw-r--r--drivers/hid/usbhid/hid-quirks.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/drivers/hid/usbhid/hid-quirks.c b/drivers/hid/usbhid/hid-quirks.c
index 6b21a214f419..334c5fce987c 100644
--- a/drivers/hid/usbhid/hid-quirks.c
+++ b/drivers/hid/usbhid/hid-quirks.c
@@ -86,6 +86,9 @@
86 86
87#define USB_VENDOR_ID_CIDC 0x1677 87#define USB_VENDOR_ID_CIDC 0x1677
88 88
89#define USB_VENDOR_ID_CMEDIA 0x0d8c
90#define USB_DEVICE_ID_CM109 0x000e
91
89#define USB_VENDOR_ID_CODEMERCS 0x07c0 92#define USB_VENDOR_ID_CODEMERCS 0x07c0
90#define USB_DEVICE_ID_CODEMERCS_IOW_FIRST 0x1500 93#define USB_DEVICE_ID_CODEMERCS_IOW_FIRST 0x1500
91#define USB_DEVICE_ID_CODEMERCS_IOW_LAST 0x15ff 94#define USB_DEVICE_ID_CODEMERCS_IOW_LAST 0x15ff
@@ -387,6 +390,7 @@ static const struct hid_blacklist {
387 { USB_VENDOR_ID_ASUS, USB_DEVICE_ID_ASUS_LCM, HID_QUIRK_IGNORE}, 390 { USB_VENDOR_ID_ASUS, USB_DEVICE_ID_ASUS_LCM, HID_QUIRK_IGNORE},
388 { USB_VENDOR_ID_BERKSHIRE, USB_DEVICE_ID_BERKSHIRE_PCWD, HID_QUIRK_IGNORE }, 391 { USB_VENDOR_ID_BERKSHIRE, USB_DEVICE_ID_BERKSHIRE_PCWD, HID_QUIRK_IGNORE },
389 { USB_VENDOR_ID_CIDC, 0x0103, HID_QUIRK_IGNORE }, 392 { USB_VENDOR_ID_CIDC, 0x0103, HID_QUIRK_IGNORE },
393 { USB_VENDOR_ID_CMEDIA, USB_DEVICE_ID_CM109, HID_QUIRK_IGNORE },
390 { USB_VENDOR_ID_CYPRESS, USB_DEVICE_ID_CYPRESS_HIDCOM, HID_QUIRK_IGNORE }, 394 { USB_VENDOR_ID_CYPRESS, USB_DEVICE_ID_CYPRESS_HIDCOM, HID_QUIRK_IGNORE },
391 { USB_VENDOR_ID_CYPRESS, USB_DEVICE_ID_CYPRESS_ULTRAMOUSE, HID_QUIRK_IGNORE }, 395 { USB_VENDOR_ID_CYPRESS, USB_DEVICE_ID_CYPRESS_ULTRAMOUSE, HID_QUIRK_IGNORE },
392 { USB_VENDOR_ID_DELORME, USB_DEVICE_ID_DELORME_EARTHMATE, HID_QUIRK_IGNORE }, 396 { USB_VENDOR_ID_DELORME, USB_DEVICE_ID_DELORME_EARTHMATE, HID_QUIRK_IGNORE },