Skip to content

Commit 7cdf6e4

Browse files
skomraJiri Kosina
authored andcommitted
HID: wacom: add back changes dropped in merge commit
Merge commit 74acee3 ("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 912c6aa ("HID: wacom: Add 2nd gen Intuos Pro Small support"). Signed-off-by: Aaron Armstrong Skomra <[email protected]> Signed-off-by: Jiri Kosina <[email protected]>
1 parent f4eb142 commit 7cdf6e4

File tree

1 file changed

+2
-1
lines changed

1 file changed

+2
-1
lines changed

drivers/hid/wacom_wac.c

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1290,7 +1290,8 @@ static void wacom_intuos_pro2_bt_pen(struct wacom_wac *wacom)
12901290
}
12911291
if (wacom->tool[0]) {
12921292
input_report_abs(pen_input, ABS_PRESSURE, get_unaligned_le16(&frame[5]));
1293-
if (wacom->features.type == INTUOSP2_BT) {
1293+
if (wacom->features.type == INTUOSP2_BT ||
1294+
wacom->features.type == INTUOSP2S_BT) {
12941295
input_report_abs(pen_input, ABS_DISTANCE,
12951296
range ? frame[13] : wacom->features.distance_max);
12961297
} else {

0 commit comments

Comments
 (0)