openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

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>
This commit is contained in:
Benjamin Tissoires 2015-03-03 12:44:04 -05:00 committed by Jiri Kosina
parent 002a82ded6
commit aa2121ac47
1 changed files with 20 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
drivers/hid/hid-uclogic.c
View File

@ -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);