diff options
| author | Aaron Armstrong Skomra | 2019-08-12 20:55:52 +0200 |
|---|---|---|
| committer | Jiri Kosina | 2019-08-13 10:52:24 +0200 |
| commit | 7cdf6e40537f4f287c8e21b99cb4cd082a33bef0 (patch) | |
| tree | 126201bf14dd41799ddff4d20b083318866081b9 | |
| parent | Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/hid... (diff) | |
| download | kernel-qcow2-linux-7cdf6e40537f4f287c8e21b99cb4cd082a33bef0.tar.gz kernel-qcow2-linux-7cdf6e40537f4f287c8e21b99cb4cd082a33bef0.tar.xz kernel-qcow2-linux-7cdf6e40537f4f287c8e21b99cb4cd082a33bef0.zip | |
HID: wacom: add back changes dropped in merge commit
Merge commit 74acee309fb2 ("Merge branches 'for-5.2/fixes', 'for-5.3/doc',
'for-5.3/ish', 'for-5.3/logitech' and 'for-5.3/wacom' into for-linus")
inadvertently dropped this change from commit 912c6aa67ad4
("HID: wacom: Add 2nd gen Intuos Pro Small support").
Signed-off-by: Aaron Armstrong Skomra <aaron.skomra@wacom.com>
Signed-off-by: Jiri Kosina <jkosina@suse.cz>
| -rw-r--r-- | drivers/hid/wacom_wac.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/hid/wacom_wac.c b/drivers/hid/wacom_wac.c index 7a8ddc999a8e..50074485b88b 100644 --- a/drivers/hid/wacom_wac.c +++ b/drivers/hid/wacom_wac.c @@ -1290,7 +1290,8 @@ static void wacom_intuos_pro2_bt_pen(struct wacom_wac *wacom) } if (wacom->tool[0]) { input_report_abs(pen_input, ABS_PRESSURE, get_unaligned_le16(&frame[5])); - if (wacom->features.type == INTUOSP2_BT) { + if (wacom->features.type == INTUOSP2_BT || + wacom->features.type == INTUOSP2S_BT) { input_report_abs(pen_input, ABS_DISTANCE, range ? frame[13] : wacom->features.distance_max); } else { |