summaryrefslogtreecommitdiff
path: root/drivers/hid
diff options
context:
space:
mode:
authorBenjamin Tissoires <benjamin.tissoires@redhat.com>2015-03-15 21:26:27 +0300
committerJiri Kosina <jkosina@suse.cz>2015-03-16 17:46:47 +0300
commitee20fe2386e4390285cfbd52b9a67596d1f1e894 (patch)
treeb2b8ab13477f008debf2522a8676b5fd4277f811 /drivers/hid
parentbbb2d8a890733256d12b2c796eadaf54e70e9af5 (diff)
downloadlinux-ee20fe2386e4390285cfbd52b9a67596d1f1e894.tar.xz
HID: uclogic: make input_mapping independent of usb
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>
Diffstat (limited to 'drivers/hid')
-rw-r--r--drivers/hid/hid-uclogic.c17
1 files changed, 8 insertions, 9 deletions
diff --git a/drivers/hid/hid-uclogic.c b/drivers/hid/hid-uclogic.c
index bdda9fd05c1f..94167310e15a 100644
--- a/drivers/hid/hid-uclogic.c
+++ b/drivers/hid/hid-uclogic.c
@@ -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;
-
- if (hdev->product == USB_DEVICE_ID_HUION_TABLET) {
- intf = to_usb_interface(hdev->dev.parent);
+ struct uclogic_drvdata *drvdata = hid_get_drvdata(hdev);
- /* 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;
}