| Message ID | 1565636152-21942-1-git-send-email-aaron.skomra@wacom.com (mailing list archive) |
|---|---|
| State | Mainlined |
| Commit | 7cdf6e40537f4f287c8e21b99cb4cd082a33bef0 |
| Delegated to: | Jiri Kosina |
| Headers | show |
| Series | HID: wacom: add back changes dropped in merge commit | expand |
On Mon, 12 Aug 2019, Aaron Armstrong Skomra wrote: > 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"). Mea culpa maxima, thanks for catching this. Now applied to for-5.3/upstream-fixes and I will be sending it to Linus this week still.
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 {
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> --- drivers/hid/wacom_wac.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)