aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/hid
diff options
context:
space:
mode:
authorJason Gerecke <killertofu@gmail.com>2014-07-24 16:15:31 -0400
committerDmitry Torokhov <dmitry.torokhov@gmail.com>2014-07-25 21:55:52 -0400
commit0b335cad73c800717856f8f5a5509d367c38b61d (patch)
tree09828dd43fa7cb60c3fd308bb932ecbc18224e01 /drivers/hid
parent471d17148c8b4174ac5f5283a73316d12c4379bc (diff)
Input: wacom - support up to 2048 pressure levels with ISDv4
Signed-off-by: Jason Gerecke <killertofu@gmail.com> Signed-off-by: Benjamin Tissoires <benjamin.tissoires@redhat.com> Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com>
Diffstat (limited to 'drivers/hid')
-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 cd915211fcca..2f3a3a77d0c6 100644
--- a/drivers/hid/wacom_wac.c
+++ b/drivers/hid/wacom_wac.c
@@ -1086,7 +1086,7 @@ static int wacom_tpc_pen(struct wacom_wac *wacom)
1086 input_report_key(input, BTN_STYLUS2, data[1] & 0x10); 1086 input_report_key(input, BTN_STYLUS2, data[1] & 0x10);
1087 input_report_abs(input, ABS_X, le16_to_cpup((__le16 *)&data[2])); 1087 input_report_abs(input, ABS_X, le16_to_cpup((__le16 *)&data[2]));
1088 input_report_abs(input, ABS_Y, le16_to_cpup((__le16 *)&data[4])); 1088 input_report_abs(input, ABS_Y, le16_to_cpup((__le16 *)&data[4]));
1089 input_report_abs(input, ABS_PRESSURE, ((data[7] & 0x03) << 8) | data[6]); 1089 input_report_abs(input, ABS_PRESSURE, ((data[7] & 0x07) << 8) | data[6]);
1090 input_report_key(input, BTN_TOUCH, data[1] & 0x05); 1090 input_report_key(input, BTN_TOUCH, data[1] & 0x05);
1091 input_report_key(input, wacom->tool[0], prox); 1091 input_report_key(input, wacom->tool[0], prox);
1092 return 1; 1092 return 1;