From 45467dd2228759a28a270ba52c807c469944a618 Mon Sep 17 00:00:00 2001
From: Zheng XiaoJun <zhengxiaojun@hsic.com.cn>
Date: Mon, 5 Feb 2007 16:40:57 -0800
Subject: [PATCH] --- yaml --- r: 48745 b: refs/heads/master c:
 3f9b4076f73d2cac59e19a85e2a97d9d2152bf26 h: refs/heads/master i:   48743:
 d4ad60d5b157d0fa88b5d12d0f6e268b87a976a7 v: v3

---
 [refs]                             | 2 +-
 trunk/drivers/usb/input/hid-core.c | 3 +++
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 61d958710d31..2a2744d530d3 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: d0b4e31093e2e9b38e61f3f4d6378e3238e71350
+refs/heads/master: 3f9b4076f73d2cac59e19a85e2a97d9d2152bf26
diff --git a/trunk/drivers/usb/input/hid-core.c b/trunk/drivers/usb/input/hid-core.c
index 4d8ed3d71a15..02dd239ce025 100644
--- a/trunk/drivers/usb/input/hid-core.c
+++ b/trunk/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 }
 };