From 0ddd1330ce79c10cde8406ad6c21036b31b0e9e0 Mon Sep 17 00:00:00 2001 From: Jiri Kosina Date: Thu, 29 Jan 2009 00:15:51 +0100 Subject: [PATCH] --- yaml --- r: 140397 b: refs/heads/master c: 6f4303fb2ec68055e793b84887a7ae0f9ea7cc2d h: refs/heads/master i: 140395: cea2f5657997890ea505e75316e081f12b307b63 v: v3 --- [refs] | 2 +- trunk/drivers/hid/usbhid/hid-core.c | 3 +++ trunk/include/linux/hid.h | 1 + 3 files changed, 5 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index 02074def93dc..5e20290d6e08 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 205adbec0d5159f23b235bbcd386dd1bcb6d0180 +refs/heads/master: 6f4303fb2ec68055e793b84887a7ae0f9ea7cc2d diff --git a/trunk/drivers/hid/usbhid/hid-core.c b/trunk/drivers/hid/usbhid/hid-core.c index f0a0f72238ab..eed05a3017e5 100644 --- a/trunk/drivers/hid/usbhid/hid-core.c +++ b/trunk/drivers/hid/usbhid/hid-core.c @@ -711,6 +711,9 @@ static int usbhid_parse(struct hid_device *hid) quirks = usbhid_lookup_quirk(le16_to_cpu(dev->descriptor.idVendor), le16_to_cpu(dev->descriptor.idProduct)); + if (quirks & HID_QUIRK_IGNORE) + return -ENODEV; + /* Many keyboards and mice don't like to be polled for reports, * so we will always set the HID_QUIRK_NOGET flag for them. */ if (interface->desc.bInterfaceSubClass == USB_INTERFACE_SUBCLASS_BOOT) { diff --git a/trunk/include/linux/hid.h b/trunk/include/linux/hid.h index fa8ee9cef7be..a46cda488695 100644 --- a/trunk/include/linux/hid.h +++ b/trunk/include/linux/hid.h @@ -270,6 +270,7 @@ struct hid_item { #define HID_QUIRK_INVERT 0x00000001 #define HID_QUIRK_NOTOUCH 0x00000002 +#define HID_QUIRK_IGNORE 0x00000004 #define HID_QUIRK_NOGET 0x00000008 #define HID_QUIRK_BADPAD 0x00000020 #define HID_QUIRK_MULTI_INPUT 0x00000040