From fdd57f027c6cee68599488028c9edd321112a02c Mon Sep 17 00:00:00 2001 From: Daniel Mack Date: Mon, 12 Jul 2010 19:28:27 +0200 Subject: [PATCH] --- yaml --- r: 204398 b: refs/heads/master c: 3a343ee4509c982552b35fbc99d3213f3bb1acde h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/hid/hid-core.c | 2 ++ trunk/include/linux/hid.h | 1 + 3 files changed, 4 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index a7a6fab63d55..9edef7e62a0a 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: fc99f22c5de2177431cada350417ac6e353380c7 +refs/heads/master: 3a343ee4509c982552b35fbc99d3213f3bb1acde diff --git a/trunk/drivers/hid/hid-core.c b/trunk/drivers/hid/hid-core.c index 866e54ec5fb2..7ccee899b59e 100644 --- a/trunk/drivers/hid/hid-core.c +++ b/trunk/drivers/hid/hid-core.c @@ -1157,6 +1157,8 @@ int hid_connect(struct hid_device *hdev, unsigned int connect_mask) if (hdev->quirks & HID_QUIRK_HIDDEV_FORCE) connect_mask |= (HID_CONNECT_HIDDEV_FORCE | HID_CONNECT_HIDDEV); + if (hdev->quirks & HID_QUIRK_HIDINPUT_FORCE) + connect_mask |= HID_CONNECT_HIDINPUT_FORCE; if (hdev->bus != BUS_USB) connect_mask &= ~HID_CONNECT_HIDDEV; if (hid_hiddev(hdev)) diff --git a/trunk/include/linux/hid.h b/trunk/include/linux/hid.h index 895001f7f4b2..42a0f1d11365 100644 --- a/trunk/include/linux/hid.h +++ b/trunk/include/linux/hid.h @@ -311,6 +311,7 @@ struct hid_item { #define HID_QUIRK_HIDDEV_FORCE 0x00000010 #define HID_QUIRK_BADPAD 0x00000020 #define HID_QUIRK_MULTI_INPUT 0x00000040 +#define HID_QUIRK_HIDINPUT_FORCE 0x00000080 #define HID_QUIRK_SKIP_OUTPUT_REPORTS 0x00010000 #define HID_QUIRK_FULLSPEED_INTERVAL 0x10000000 #define HID_QUIRK_NO_INIT_REPORTS 0x20000000