diff options
author | Zheng XiaoJun <zhengxiaojun@hsic.com.cn> | 2007-02-05 19:40:57 -0500 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@suse.de> | 2007-02-16 18:32:20 -0500 |
commit | 3f9b4076f73d2cac59e19a85e2a97d9d2152bf26 (patch) | |
tree | 6d9d7606ba16372911c9ae935f12f39cf142cd05 /drivers/usb | |
parent | d0b4e31093e2e9b38e61f3f4d6378e3238e71350 (diff) |
USB: input: HID: add CIDC USB device to HID blacklist
Add CIDC USB device to HID blacklist since it is actually a USB token
and has its own driver.
Signed-off-by: Zheng XiaoJun <zhengxiaojun@hsic.com.cn>
Cc: Dmitry Torokhov <dtor@mail.ru>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/usb')
-rw-r--r-- | drivers/usb/input/hid-core.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/usb/input/hid-core.c b/drivers/usb/input/hid-core.c index 4d8ed3d71a15..02dd239ce025 100644 --- a/drivers/usb/input/hid-core.c +++ b/drivers/usb/input/hid-core.c | |||
@@ -515,6 +515,7 @@ void usbhid_close(struct hid_device *hid) | |||
515 | 515 | ||
516 | #define USB_VENDOR_ID_TURBOX 0x062a | 516 | #define USB_VENDOR_ID_TURBOX 0x062a |
517 | #define USB_DEVICE_ID_TURBOX_KEYBOARD 0x0201 | 517 | #define USB_DEVICE_ID_TURBOX_KEYBOARD 0x0201 |
518 | #define USB_VENDOR_ID_CIDC 0x1677 | ||
518 | 519 | ||
519 | /* | 520 | /* |
520 | * Initialize all reports | 521 | * Initialize all reports |
@@ -953,6 +954,8 @@ static const struct hid_blacklist { | |||
953 | 954 | ||
954 | { USB_VENDOR_ID_SONY, USB_DEVICE_ID_SONY_PS3_CONTROLLER, HID_QUIRK_SONY_PS3_CONTROLLER }, | 955 | { USB_VENDOR_ID_SONY, USB_DEVICE_ID_SONY_PS3_CONTROLLER, HID_QUIRK_SONY_PS3_CONTROLLER }, |
955 | 956 | ||
957 | { USB_VENDOR_ID_CIDC, 0x0103, HID_QUIRK_IGNORE }, | ||
958 | |||
956 | { 0, 0 } | 959 | { 0, 0 } |
957 | }; | 960 | }; |
958 | 961 | ||