Skip to contentSkip to conversation

Patch "HID: wacom: Properly report negative values from Intuos Pro 2 Bluetooth" has been added to the 4.13-stable tree

PATCH [email protected] 1 participant 1 message Oct 10, 2017

Subsystems (3)
lore
Share & tools
lore

[email protected]

author maintainer Applied
#0 lore raw

This is a note to let you know that I've just added the patch titled

HID: wacom: Properly report negative values from Intuos Pro 2 Bluetooth

to the 4.13-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary

The filename of the patch is:
hid-wacom-properly-report-negative-values-from-intuos-pro-2-bluetooth.patch
and it can be found in the queue-4.13 subdirectory.

If you, or anyone else, feels it should not be added to the stable tree, please let <[email protected]> know about it.

Quoted 1 line

From b63c4c2718d641ba9bec888994f0cb0c23a1ef45 Mon Sep 17 00:00:00 2001

From: Jason Gerecke <[email protected]>
Date: Wed, 30 Aug 2017 15:13:25 -0700
Subject: HID: wacom: Properly report negative values from Intuos Pro 2 Bluetooth

From: Jason Gerecke <[email protected]>

commit b63c4c2718d641ba9bec888994f0cb0c23a1ef45 upstream.

The wacom driver's IRQ handler for Bluetooth reports from the 2nd-gen Intuos Pro does not correctly process negative numbers. Values for tilt and rotation (which can go negative) are instead interpreted as unsigned and so jump to very large values when the data should be negative. This commit properly casts the data to ensure we report negative numbers when necessary.

Fixes 4922cd2 ("HID: wacom: Support 2nd-gen Intuos Pro's Bluetooth classic interface")
---
 drivers/hid/wacom_wac.c |    6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)
drivers/hid/wacom_wac.c +3 -3
@@ -1229,9 +1229,9 @@ static void wacom_intuos_pro2_bt_pen(str
 		if (range) {
 			input_report_abs(pen_input, ABS_X, get_unaligned_le16(&frame[1]));
 			input_report_abs(pen_input, ABS_Y, get_unaligned_le16(&frame[3]));
-			input_report_abs(pen_input, ABS_TILT_X, frame[7]);
-			input_report_abs(pen_input, ABS_TILT_Y, frame[8]);
-			input_report_abs(pen_input, ABS_Z, get_unaligned_le16(&frame[9]));
+			input_report_abs(pen_input, ABS_TILT_X, (char)frame[7]);
+			input_report_abs(pen_input, ABS_TILT_Y, (char)frame[8]);
+			input_report_abs(pen_input, ABS_Z, (int16_t)get_unaligned_le16(&frame[9]));
 			input_report_abs(pen_input, ABS_WHEEL, get_unaligned_le16(&frame[11]));
 		}
 		input_report_abs(pen_input, ABS_PRESSURE, get_unaligned_le16(&frame[5]));

Patches currently in stable-queue which might be from [email protected] are

queue-4.13/hid-wacom-always-increment-hdev-refcount-within-wacom_get_hdev_data.patch queue-4.13/hid-wacom-correct-coordinate-system-of-touchring-and-pen-twist.patch queue-4.13/hid-wacom-properly-report-negative-values-from-intuos-pro-2-bluetooth.patch queue-4.13/hid-wacom-bits-shifted-too-much-for-9th-and-10th-buttons.patch queue-4.13/hid-wacom-generic-send-msc_serial-and-abs_misc-when-leaving-prox.patch queue-4.13/hid-wacom-generic-clear-abs_misc-when-tool-leaves-proximity.patch