---

yaml --- r: 48745 b: refs/heads/master c: 3f9b407 h: refs/heads/master i: 48743: d4ad60d v: v3
git-mirror · Feb 16, 2007 · 45467dd · 45467dd
1 parent 46738d5
commit 45467dd
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
diff --git 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
@@ -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 }
 };