From 09c79d36544fa35f55c4d23bb42153044682c817 Mon Sep 17 00:00:00 2001 From: Henk Vergonet Date: Mon, 15 May 2006 12:34:43 +0200 Subject: [PATCH] --- yaml --- r: 28303 b: refs/heads/master c: 5cd330f4f30eb154e7af9210bed42dfcd447997f h: refs/heads/master i: 28301: 7d6251552f04f81b6dab20304b81e6778fd357ba 28299: ca01e57f88b0b47c09e212ce4eab5ff7ba4d5adc 28295: 514cbe987498a94594cade2a7452915d8b4b00b0 28287: 1105efae13b869fc42c8106cc55c33d22cdbe7f8 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 f138abe20ed1..e5b3b5cdd536 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: c32ba30f76eb18b3d4449072fe9c345a9574796b +refs/heads/master: 5cd330f4f30eb154e7af9210bed42dfcd447997f diff --git a/trunk/drivers/usb/input/hid-core.c b/trunk/drivers/usb/input/hid-core.c index 435273e7c85c..4f7e9214de0e 100644 --- a/trunk/drivers/usb/input/hid-core.c +++ b/trunk/drivers/usb/input/hid-core.c @@ -1563,6 +1563,8 @@ void hid_init_reports(struct hid_device *hid) #define USB_VENDOR_ID_CREATIVELABS 0x062a #define USB_DEVICE_ID_CREATIVELABS_SILVERCREST 0x0201 +#define USB_VENDOR_ID_YEALINK 0x6993 +#define USB_DEVICE_ID_YEALINK_P1K_P4K_B2K 0xb001 /* * Alphabetically sorted blacklist by quirk type. */ @@ -1671,6 +1673,7 @@ static const struct hid_blacklist { { USB_VENDOR_ID_WACOM, USB_DEVICE_ID_WACOM_DTF + 3, HID_QUIRK_IGNORE }, { USB_VENDOR_ID_WISEGROUP, USB_DEVICE_ID_4_PHIDGETSERVO_20, HID_QUIRK_IGNORE }, { USB_VENDOR_ID_WISEGROUP, USB_DEVICE_ID_1_PHIDGETSERVO_20, HID_QUIRK_IGNORE }, + { USB_VENDOR_ID_YEALINK, USB_DEVICE_ID_YEALINK_P1K_P4K_B2K, HID_QUIRK_IGNORE }, { USB_VENDOR_ID_ACECAD, USB_DEVICE_ID_ACECAD_FLAIR, HID_QUIRK_IGNORE }, { USB_VENDOR_ID_ACECAD, USB_DEVICE_ID_ACECAD_302, HID_QUIRK_IGNORE },