aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJason Gerecke <killertofu@gmail.com>2015-08-17 20:41:53 -0400
committerJiri Kosina <jkosina@suse.cz>2015-08-18 09:15:29 -0400
commit76703be827a7867c28b904562bc78ed1314698bc (patch)
treefd7596f37727cee69b3d3cb7af4659f322c35692
parent025bcc154027fc52b1aee192c4599bb6ee6a3c9c (diff)
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>
-rw-r--r--drivers/hid/wacom_wac.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/hid/wacom_wac.c b/drivers/hid/wacom_wac.c
index fe164dfc8a7c..3024a3c2b4ff 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)
1772 int y = (data[3] << 4) | (data[4] & 0x0f); 1772 int y = (data[3] << 4) | (data[4] & 0x0f);
1773 int width, height; 1773 int width, height;
1774 1774
1775 if (features->type >= INTUOSPS && features->type <= INTUOSPL) { 1775 if (features->type >= INTUOSPS && features->type <= INTUOSHT) {
1776 width = data[5] * 100; 1776 width = data[5] * 100;
1777 height = data[6] * 100; 1777 height = data[6] * 100;
1778 } else { 1778 } else {