All of lore.kernel.org
 help / color / mirror / Atom feed
* - input-hid-add-cidc-usb-device-to-hid-blacklist.patch removed from -mm tree
@ 2007-02-15  8:51 akpm
  0 siblings, 0 replies; only message in thread
From: akpm @ 2007-02-15  8:51 UTC (permalink / raw)
  To: zhengxiaojun, dtor, greg, mm-commits


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@hsic.com.cn>

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>
Cc: Greg KH <greg@kroah.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
---

 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@hsic.com.cn are

^ permalink raw reply	[flat|nested] only message in thread

only message in thread, other threads:[~2007-02-15  8:52 UTC | newest]

Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2007-02-15  8:51 - input-hid-add-cidc-usb-device-to-hid-blacklist.patch removed from -mm tree akpm

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.