Commit 7cdf6e40 authored Aug 12, 2019 by Aaron Armstrong Skomra Committed by Jiri Kosina Aug 13, 2019

HID: wacom: add back changes dropped in merge commit



Merge commit 74acee30 ("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 912c6aa6
("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>

parent f4eb1423

drivers/hid/wacom_wac.c

+2 −1

Original line number	Diff line number	Diff line
		@@ -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 {

Admin message