From: Jason Gerecke <killertofu@gmail.com>
Date: Tue, 18 Aug 2015 00:41:53 +0000 (-0700)
Subject: HID: wacom: Use tablet-provided touch height/width values for INTUOSHT
X-Git-Tag: submit/tizen/20160607.132125~1859^2~1^12~3
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=76703be827a7867c28b904562bc78ed1314698bc;p=sdk%2Femulator%2Femulator-kernel.git

HID: wacom: Use tablet-provided touch height/width values for INTUOSHT

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>
---

diff --git a/drivers/hid/wacom_wac.c b/drivers/hid/wacom_wac.c
index fe164df..3024a3c 100644
--- a/drivers/hid/wacom_wac.c
+++ b/drivers/hid/wacom_wac.c
@@ -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 {