iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

HID: uclogic: make input_mapping independent of usb

Browse Source 
No need to retrieve the USB handle in input_mapping() when we already
do that in probe. It also allows to use the quirk without having to
add the product ID matching.

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-15 14:26:27 -04:00 committed by Jiri Kosina
parent bbb2d8a890
commit ee20fe2386
1 changed files with 8 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -627,6 +627,7 @@ struct uclogic_drvdata {
__u8 *rdesc;
unsigned int rsize;
bool invert_pen_inrange;
bool ignore_pen_usage;
};
static __u8 *uclogic_report_fixup(struct hid_device *hdev, __u8 *rdesc,
@ -719,16 +720,12 @@ 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;
struct uclogic_drvdata *drvdata = hid_get_drvdata(hdev);
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;
}
/* discard the unused pen interface */
if ((drvdata->ignore_pen_usage) &&
(field->application == HID_DG_PEN))
return -1;
/* let hid-core decide what to do */
return 0;
@ -908,6 +905,8 @@ static int uclogic_probe(struct hid_device *hdev,
return rc;
}
drvdata->invert_pen_inrange = true;
} else {
drvdata->ignore_pen_usage = true;
}
break;
}