From 34f93b375f49021ea5985ecb01be216a6532d172 Mon Sep 17 00:00:00 2001 From: Jeffrey Vandenbroucke sign Date: Tue, 28 Mar 2006 15:21:36 -0800 Subject: [PATCH] --- yaml --- r: 25755 b: refs/heads/master c: bfb25849f00d0b8453191ee12125738b5f5c9146 h: refs/heads/master i: 25753: 5dab2c5c1dd9e5f9fb98ffb5bef9881b4dbcfd13 25751: 94811a09fa2999ec122be78ffb6037b6fd2ea0d6 v: v3 --- [refs] | 2 +- trunk/drivers/usb/input/hid-core.c | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index 60c79f75af91..402102bb252a 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 8e32640672bdcb01e0d83f087f09dd65fcbc3275 +refs/heads/master: bfb25849f00d0b8453191ee12125738b5f5c9146 diff --git a/trunk/drivers/usb/input/hid-core.c b/trunk/drivers/usb/input/hid-core.c index f2225d1ddb0d..f419bd82ab7f 100644 --- a/trunk/drivers/usb/input/hid-core.c +++ b/trunk/drivers/usb/input/hid-core.c @@ -1374,6 +1374,9 @@ void hid_close(struct hid_device *hid) #define USB_VENDOR_ID_PANJIT 0x134c +#define USB_VENDOR_ID_SILVERCREST 0x062a +#define USB_DEVICE_ID_SILVERCREST_KB 0x0201 + /* * Initialize all reports */ @@ -1680,6 +1683,7 @@ static const struct hid_blacklist { { USB_VENDOR_ID_HP, USB_DEVICE_ID_HP_USBHUB_KB, HID_QUIRK_NOGET }, { USB_VENDOR_ID_TANGTOP, USB_DEVICE_ID_TANGTOP_USBPS2, HID_QUIRK_NOGET }, { USB_VENDOR_ID_WISEGROUP, USB_DEVICE_ID_DUAL_USB_JOYPAD, HID_QUIRK_NOGET | HID_QUIRK_MULTI_INPUT }, + { USB_VENDOR_ID_SILVERCREST, USB_DEVICE_ID_SILVERCREST_KB, HID_QUIRK_NOGET }, { USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_POWERMOUSE, HID_QUIRK_2WHEEL_POWERMOUSE }, { USB_VENDOR_ID_A4TECH, USB_DEVICE_ID_A4TECH_WCP32PU, HID_QUIRK_2WHEEL_MOUSE_HACK_7 },