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>

diff --git a/drivers/hid/wacom_wac.c b/drivers/hid/wacom_wac.c
index f70660465a54f84bfe3bb97d64cbd5b0e11fd7e0..3aeddc297652b50ee433edafafa1410f6feba1b2 100644 (file)
--- 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);
        }

diff --git a/drivers/hid/wacom_wac.h b/drivers/hid/wacom_wac.h
index 3f60192e92726dd942b7b0a8f44d1e1ffc8d1e1d..25baa7f295997f65759d8da1c6dc239c01258156 100644 (file)
--- a/drivers/hid/wacom_wac.h
+++ b/drivers/hid/wacom_wac.h
@@ -70,6 +70,7 @@
 #define WACOM_REPORT_DEVICE_LIST       16
 #define WACOM_REPORT_INTUOS_PEN                16
 #define WACOM_REPORT_REMOTE            17
+#define WACOM_REPORT_INTUOSHT2_ID      8
 
 /* device quirks */
 #define WACOM_QUIRK_BBTOUCH_LOWRES     0x0001