[PATCH 01/11] HID: wacom: fix proximity tool release

Peter Hutterer peter.hutterer at who-t.net
Wed May 30 05:13:17 UTC 2012


From: Przemo Firszt <przemo at firszt.eu>

Don't zero the current tool before reporting its release to the input
subsystem.

Signed-off-by: Aristeu Rozanski <aris at redhat.com>
Tested-by: Przemo Firszt <przemo at firszt.eu>
Signed-off-by: Jiri Kosina <jkosina at suse.cz>
(cherry picked from commit 32db737fb2bfe9013362c9dc2c7af998edc758be)
---
 drivers/hid/hid-wacom.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/hid/hid-wacom.c b/drivers/hid/hid-wacom.c
index acab74c..8b49229 100644
--- a/drivers/hid/hid-wacom.c
+++ b/drivers/hid/hid-wacom.c
@@ -322,10 +322,10 @@ static void wacom_i4_parse_pen_report(struct wacom_data *wdata,
 
 	switch (data[1]) {
 	case 0x80: /* Out of proximity report */
-		wdata->tool = 0;
 		input_report_key(input, BTN_TOUCH, 0);
 		input_report_abs(input, ABS_PRESSURE, 0);
 		input_report_key(input, wdata->tool, 0);
+		wdata->tool = 0;
 		input_sync(input);
 		break;
 	case 0xC2: /* Tool report */
-- 
1.7.10.1



More information about the kernel mailing list