From: Zheng XiaoJun Date: Tue, 6 Feb 2007 00:40:57 +0000 (-0800) Subject: USB: input: HID: add CIDC USB device to HID blacklist X-Git-Tag: v2.6.21-rc1~82^2~20 X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=3f9b4076f73d2cac59e19a85e2a97d9d2152bf26;p=linux-2.6-omap-h63xx.git 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 Cc: Dmitry Torokhov Signed-off-by: Andrew Morton Signed-off-by: Greg Kroah-Hartman --- diff --git a/drivers/usb/input/hid-core.c b/drivers/usb/input/hid-core.c index 4d8ed3d71a1..02dd239ce02 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) #define USB_VENDOR_ID_TURBOX 0x062a #define USB_DEVICE_ID_TURBOX_KEYBOARD 0x0201 +#define USB_VENDOR_ID_CIDC 0x1677 /* * Initialize all reports @@ -953,6 +954,8 @@ static const struct hid_blacklist { { USB_VENDOR_ID_SONY, USB_DEVICE_ID_SONY_PS3_CONTROLLER, HID_QUIRK_SONY_PS3_CONTROLLER }, + { USB_VENDOR_ID_CIDC, 0x0103, HID_QUIRK_IGNORE }, + { 0, 0 } };