Patch "Revert "Input: wacom_w8001 - drop use of ABS_MT_TOOL_TYPE"" has been added to the 4.6-stable tree

Patch "Revert "Input: wacom_w8001 - drop use of ABS_MT_TOOL_TYPE"" has been added to the 4.6-stable tree

[gregkh]

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

    Revert "Input: wacom_w8001 - drop use of ABS_MT_TOOL_TYPE"

to the 4.6-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:
     revert-input-wacom_w8001-drop-use-of-abs_mt_tool_type.patch
and it can be found in the queue-4.6 subdirectory.

If you, or anyone else, feels it should not be added to the stable tree,
please let <stable@vger.kernel.org> know about it.


>From 3e9161bfe0482f26efeaf584d5fd69398c69313c Mon Sep 17 00:00:00 2001
From: Dmitry Torokhov <dmitry.torokhov@gmail.com>
Date: Thu, 14 Jul 2016 09:33:41 -0700
Subject: Revert "Input: wacom_w8001 - drop use of ABS_MT_TOOL_TYPE"

From: Dmitry Torokhov <dmitry.torokhov@gmail.com>

commit 3e9161bfe0482f26efeaf584d5fd69398c69313c upstream.

This reverts commit 5f7e5445a2de848c66d2d80ba5479197e8287c33 because
removal of input_mt_report_slot_state() means we no longer generate
tracking IDs for the reported contacts.

Acked-by: Peter Hutterer <peter.hutterer@who-t.net>
Acked-by: Ping Cheng <pinglinux@gmail.com>

---
 drivers/input/touchscreen/wacom_w8001.c |    3 +++
 1 file changed, 3 insertions(+)

--- a/drivers/input/touchscreen/wacom_w8001.c
+++ b/drivers/input/touchscreen/wacom_w8001.c
@@ -155,6 +155,7 @@ static void parse_multi_touch(struct w80
 		bool touch = data[0] & (1 << i);
 
 		input_mt_slot(dev, i);
+		input_mt_report_slot_state(dev, MT_TOOL_FINGER, touch);
 		if (touch) {
 			x = (data[6 * i + 1] << 7) | data[6 * i + 2];
 			y = (data[6 * i + 3] << 7) | data[6 * i + 4];
@@ -522,6 +523,8 @@ static int w8001_setup_touch(struct w800
 					0, touch.x, 0, 0);
 		input_set_abs_params(dev, ABS_MT_POSITION_Y,
 					0, touch.y, 0, 0);
+		input_set_abs_params(dev, ABS_MT_TOOL_TYPE,
+					0, MT_TOOL_MAX, 0, 0);
 
 		strlcat(basename, " 2FG", basename_sz);
 		if (w8001->max_pen_x && w8001->max_pen_y)


Patches currently in stable-queue which might be from dmitry.torokhov@gmail.com are

queue-4.6/input-elantech-add-more-ic-body-types-to-the-list.patch
queue-4.6/input-xpad-validate-usb-endpoint-count-during-probe.patch
queue-4.6/input-xpad-fix-oops-when-attaching-an-unknown-xbox-one-gamepad.patch
queue-4.6/input-synaptics-rmi4-fix-maximum-size-check-for-f12-control-register-8.patch
queue-4.6/revert-input-wacom_w8001-drop-use-of-abs_mt_tool_type.patch
queue-4.6/input-wacom_w8001-w8001_max_length-should-be-13.patch
queue-4.6/input-vmmouse-remove-port-reservation.patch
queue-4.6/input-wacom_w8001-ignore-invalid-pen-data-packets.patch
queue-4.6/input-tsc200x-report-proper-input_dev-name.patch