HID: wacom: add missed stylus_in_proximity line back
authorPing Cheng <pinglinux@gmail.com>
Tue, 3 May 2016 04:17:34 +0000 (21:17 -0700)
committerJiri Kosina <jkosina@suse.cz>
Tue, 3 May 2016 10:03:44 +0000 (12:03 +0200)
Commit 7e12978 ("HID: wacom: break out wacom_intuos_get_tool_type") by accident
removed stylus_in_proximity flag for Intuos series while shuffling the code
around.

Fix that by reintroducing that flag setting in wacom_intuos_inout(), where
it originally was.

Fixes: 7e12978 ("HID: wacom: break out wacom_intuos_get_tool_type")
Signed-off-by: Ping Cheng <pingc@wacom.com>
Signed-off-by: Jiri Kosina <jkosina@suse.cz>
drivers/hid/wacom_wac.c

index e9902f2f8ec9e5a56f779b37a506eede8ad3f870..cf2ba43453fd4ecd9458075a9767676534a354fe 100644 (file)
@@ -684,6 +684,7 @@ static int wacom_intuos_inout(struct wacom_wac *wacom)
 
                wacom->tool[idx] = wacom_intuos_get_tool_type(wacom->id[idx]);
 
+               wacom->shared->stylus_in_proximity = true;
                return 1;
        }