mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-08-22 08:49:45 +00:00
HID: wacom: add back changes dropped in merge commit
Merge commit74acee309f
("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 commit912c6aa67a
("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>
This commit is contained in:
parent
f4eb1423e4
commit
7cdf6e4053
1 changed files with 2 additions and 1 deletions
|
@ -1290,7 +1290,8 @@ static void wacom_intuos_pro2_bt_pen(struct wacom_wac *wacom)
|
||||||
}
|
}
|
||||||
if (wacom->tool[0]) {
|
if (wacom->tool[0]) {
|
||||||
input_report_abs(pen_input, ABS_PRESSURE, get_unaligned_le16(&frame[5]));
|
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,
|
input_report_abs(pen_input, ABS_DISTANCE,
|
||||||
range ? frame[13] : wacom->features.distance_max);
|
range ? frame[13] : wacom->features.distance_max);
|
||||||
} else {
|
} else {
|
||||||
|
|
Loading…
Reference in a new issue