leandrof/linux
1
0
Fork 0
forked from Minki/linux
Code Issues Pull Requests Packages Projects Releases Wiki Activity

HID: wacom: Use correct report to query pen ID from INTUOSHT2 devices

Browse Source 
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>
This commit is contained in:
Jason Gerecke 2016-01-06 13:25:53 -08:00 committed by Jiri Kosina
parent 0402b6b77a
commit 0bbfe28ad0
2 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
drivers/hid/wacom_wac.c
View File

@ -439,11 +439,15 @@ exit:
static void wacom_intuos_schedule_prox_event(struct wacom_wac *wacom_wac) 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 *wacom = container_of(wacom_wac, struct wacom, wacom_wac);
struct wacom_features *features = &wacom_wac->features;
struct hid_report *r; struct hid_report *r;
struct hid_report_enum *re; struct hid_report_enum *re;
re = &(wacom->hdev->report_enum[HID_FEATURE_REPORT]); 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) { if (r) {
hid_hw_request(wacom->hdev, r, HID_REQ_GET_REPORT); hid_hw_request(wacom->hdev, r, HID_REQ_GET_REPORT);
} }

1
drivers/hid/wacom_wac.h
View File

@ -70,6 +70,7 @@
#define WACOM_REPORT_DEVICE_LIST 16 #define WACOM_REPORT_DEVICE_LIST 16
#define WACOM_REPORT_INTUOS_PEN 16 #define WACOM_REPORT_INTUOS_PEN 16
#define WACOM_REPORT_REMOTE 17 #define WACOM_REPORT_REMOTE 17
#define WACOM_REPORT_INTUOSHT2_ID 8
/* device quirks */ /* device quirks */
#define WACOM_QUIRK_BBTOUCH_LOWRES 0x0001 #define WACOM_QUIRK_BBTOUCH_LOWRES 0x0001