diff options
| author | Nikolai Kondrashov <spbnick@gmail.com> | 2014-07-23 19:31:55 +0300 |
|---|---|---|
| committer | Jiri Kosina <jkosina@suse.cz> | 2014-07-29 11:21:25 +0200 |
| commit | fb853296d8ce3056c3668f2e51dee8533c32a9d5 (patch) | |
| tree | b944b9e7634cedfcaf9da6e7cdd2e5d499df6489 /drivers/hid/hid-huion.c | |
| parent | e917e98f4829a5842ea8283548bf5dedfd88b2d0 (diff) | |
HID: huion: Don't ignore other interfaces
Don't ignore non pen-reporting interfaces as they may be used by some
models reusing the same product ID.
Signed-off-by: Nikolai Kondrashov <spbnick@gmail.com>
Reviewed-by: Benjamin Tissoires <benjamin.tissoires@redhat.com>
Signed-off-by: Jiri Kosina <jkosina@suse.cz>
Diffstat (limited to 'drivers/hid/hid-huion.c')
| -rw-r--r-- | drivers/hid/hid-huion.c | 20 |
1 files changed, 7 insertions, 13 deletions
diff --git a/drivers/hid/hid-huion.c b/drivers/hid/hid-huion.c index 25d01cdd3bb..46c425bf4f0 100644 --- a/drivers/hid/hid-huion.c +++ b/drivers/hid/hid-huion.c @@ -107,17 +107,6 @@ static int huion_tablet_enable(struct hid_device *hdev) static int huion_probe(struct hid_device *hdev, const struct hid_device_id *id) { int ret; - struct usb_interface *intf = to_usb_interface(hdev->dev.parent); - - /* Ignore interfaces 1 (mouse) and 2 (keyboard) for tablet, - * as they are not used - */ - switch (id->product) { - case USB_DEVICE_ID_HUION_TABLET: - if (intf->cur_altsetting->desc.bInterfaceNumber != 0x00) - return -ENODEV; - break; - } ret = hid_parse(hdev); if (ret) { @@ -151,8 +140,13 @@ err: static int huion_raw_event(struct hid_device *hdev, struct hid_report *report, u8 *data, int size) { - /* If this is a pen input report then invert the in-range bit */ - if (report->type == HID_INPUT_REPORT && report->id == 0x07 && size >= 2) + struct usb_interface *intf = to_usb_interface(hdev->dev.parent); + + /* If this is a pen input report */ + if (intf->cur_altsetting->desc.bInterfaceNumber == 0 && + report->type == HID_INPUT_REPORT && + report->id == 0x07 && size >= 2) + /* Invert the in-range bit */ data[1] ^= 0x40; return 0; |