HID: wacom: Use tablet-provided touch height/width values for INTUOSHT
authorJason Gerecke <killertofu@gmail.com>
Tue, 18 Aug 2015 00:41:53 +0000 (17:41 -0700)
committerJiri Kosina <jkosina@suse.cz>
Tue, 18 Aug 2015 13:15:29 +0000 (15:15 +0200)
The current generation of "Intuos" tablets (i.e. INTUOSHT) report touch
width and height data just like the "Intuos Pro" do. This commit changes
the code to allow these tablets to use the appropriate codepath instead
of the one intended for Intuos5/Bamboo.

Signed-off-by: Jason Gerecke <jason.gerecke@wacom.com>
Signed-off-by: Jiri Kosina <jkosina@suse.cz>
drivers/hid/wacom_wac.c

index fe164dfc8a7ceb93b297801dd54537f1cdd2fa71..3024a3c2b4ff1aaad27bcf5915cb953769319f33 100644 (file)
@@ -1772,7 +1772,7 @@ static void wacom_bpt3_touch_msg(struct wacom_wac *wacom, unsigned char *data)
                int y = (data[3] << 4) | (data[4] & 0x0f);
                int width, height;
 
-               if (features->type >= INTUOSPS && features->type <= INTUOSPL) {
+               if (features->type >= INTUOSPS && features->type <= INTUOSHT) {
                        width  = data[5] * 100;
                        height = data[6] * 100;
                } else {