- input-hid-add-cidc-usb-device-to-hid-blacklist.patch removed from -mm tree

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



The patch titled
     input: HID: add CIDC USB device to HID blacklist
has been removed from the -mm tree.  Its filename was
     input-hid-add-cidc-usb-device-to-hid-blacklist.patch

This patch was dropped because it was merged into mainline or a subsystem tree

------------------------------------------------------
Subject: input: HID: add CIDC USB device to HID blacklist
From: Zheng XiaoJun <zhengxiaojun@xxxxxxxxxxx>

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@xxxxxxxxxxx>
Cc: Dmitry Torokhov <dtor@xxxxxxx>
Cc: Greg KH <greg@xxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---

 drivers/usb/input/hid-core.c |    3 +++
 1 file changed, 3 insertions(+)

diff -puN drivers/usb/input/hid-core.c~input-hid-add-cidc-usb-device-to-hid-blacklist drivers/usb/input/hid-core.c
--- a/drivers/usb/input/hid-core.c~input-hid-add-cidc-usb-device-to-hid-blacklist
+++ a/drivers/usb/input/hid-core.c
@@ -516,6 +516,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
@@ -954,6 +955,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 }
 };
 
_

Patches currently in -mm which might be from zhengxiaojun@xxxxxxxxxxx are


-
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html

[Index of Archives]     [Kernel Newbies FAQ]     [Kernel Archive]     [IETF Annouce]     [DCCP]     [Netdev]     [Networking]     [Security]     [Bugtraq]     [Photo]     [Yosemite]     [MIPS Linux]     [ARM Linux]     [Linux Security]     [Linux RAID]     [Linux SCSI]

  Powered by Linux