summaryrefslogtreecommitdiffstats
path: root/drivers/hid/hid-uclogic.c
diff options
context:
space:
mode:
authorBenjamin Tissoires <benjamin.tissoires@redhat.com>2015-03-03 12:44:04 -0500
committerJiri Kosina <jkosina@suse.cz>2015-03-03 21:31:55 +0100
commitaa2121ac477845eb64d46278e93765b82a005c90 (patch)
treec74f3c29a908d9a21e13ea670a5ac283011d3ef8 /drivers/hid/hid-uclogic.c
parent002a82ded6a7f4e402b1f9b953d7393ec290b709 (diff)
downloadlinux-aa2121ac477845eb64d46278e93765b82a005c90.tar.bz2
HID: uclogic: discard the extra Pen input node on Huion tablets
Some Huion tablets present 2 HID Pen interfaces. Only one is used, so we can drop the unused one. Reviewed-by: Nikolai Kondrashov <spbnick@gmail.com> Signed-off-by: Benjamin Tissoires <benjamin.tissoires@redhat.com> Signed-off-by: Jiri Kosina <jkosina@suse.cz>
Diffstat (limited to 'drivers/hid/hid-uclogic.c')
-rw-r--r--drivers/hid/hid-uclogic.c20
1 files changed, 20 insertions, 0 deletions
diff --git a/drivers/hid/hid-uclogic.c b/drivers/hid/hid-uclogic.c
index ada8a9437e3e..f44e72bc1a0a 100644
--- a/drivers/hid/hid-uclogic.c
+++ b/drivers/hid/hid-uclogic.c
@@ -713,6 +713,25 @@ static __u8 *uclogic_report_fixup(struct hid_device *hdev, __u8 *rdesc,
return rdesc;
}
+static int uclogic_input_mapping(struct hid_device *hdev, struct hid_input *hi,
+ struct hid_field *field, struct hid_usage *usage,
+ unsigned long **bit, int *max)
+{
+ struct usb_interface *intf;
+
+ if (hdev->product == USB_DEVICE_ID_HUION_TABLET) {
+ intf = to_usb_interface(hdev->dev.parent);
+
+ /* discard the unused pen interface */
+ if ((intf->cur_altsetting->desc.bInterfaceNumber != 0) &&
+ (field->application == HID_DG_PEN))
+ return -1;
+ }
+
+ /* let hid-core decide what to do */
+ return 0;
+}
+
static void uclogic_input_configured(struct hid_device *hdev,
struct hid_input *hi)
{
@@ -947,6 +966,7 @@ static struct hid_driver uclogic_driver = {
.probe = uclogic_probe,
.report_fixup = uclogic_report_fixup,
.raw_event = uclogic_raw_event,
+ .input_mapping = uclogic_input_mapping,
.input_configured = uclogic_input_configured,
};
module_hid_driver(uclogic_driver);