diff options
| author | Jason Gerecke | 2016-01-06 22:25:53 +0100 |
|---|---|---|
| committer | Jiri Kosina | 2016-01-08 10:15:22 +0100 |
| commit | 0bbfe28ad0fdc11dddae5fe6f6e4e91b7be06395 (patch) | |
| tree | a742f8f7292e93a90e9d9a5eccc795fe268ed15b /drivers/hid/wacom_wac.c | |
| parent | HID: wacom: Fix pad button range for CINTIQ_COMPANION_2 (diff) | |
| download | kernel-qcow2-linux-0bbfe28ad0fdc11dddae5fe6f6e4e91b7be06395.tar.gz kernel-qcow2-linux-0bbfe28ad0fdc11dddae5fe6f6e4e91b7be06395.tar.xz kernel-qcow2-linux-0bbfe28ad0fdc11dddae5fe6f6e4e91b7be06395.zip | |
HID: wacom: Use correct report to query pen ID from INTUOSHT2 devices
Unlike other tablets which are compatible with the wacom_intuos_irq handler,
INTUOSHT2 devices provide pen ID with report ID 8 instead of 5. To ensure
wacom_intuos_schedule_prox_event works as intended for these tablets, we
must be sure it uses the correct report ID in this case.
Signed-off-by: Jason Gerecke <jason.gerecke@wacom.com>
Signed-off-by: Jiri Kosina <jkosina@suse.cz>
Diffstat (limited to 'drivers/hid/wacom_wac.c')
| -rw-r--r-- | drivers/hid/wacom_wac.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/drivers/hid/wacom_wac.c b/drivers/hid/wacom_wac.c index f70660465a54..3aeddc297652 100644 --- a/drivers/hid/wacom_wac.c +++ b/drivers/hid/wacom_wac.c @@ -439,11 +439,15 @@ exit: static void wacom_intuos_schedule_prox_event(struct wacom_wac *wacom_wac) { struct wacom *wacom = container_of(wacom_wac, struct wacom, wacom_wac); + struct wacom_features *features = &wacom_wac->features; struct hid_report *r; struct hid_report_enum *re; re = &(wacom->hdev->report_enum[HID_FEATURE_REPORT]); - r = re->report_id_hash[WACOM_REPORT_INTUOS_ID1]; + if (features->type == INTUOSHT2) + r = re->report_id_hash[WACOM_REPORT_INTUOSHT2_ID]; + else + r = re->report_id_hash[WACOM_REPORT_INTUOS_ID1]; if (r) { hid_hw_request(wacom->hdev, r, HID_REQ_GET_REPORT); } |