aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/input
diff options
context:
space:
mode:
authorPing Cheng <pinglinux@gmail.com>2014-05-29 00:08:20 -0700
committerDmitry Torokhov <dmitry.torokhov@gmail.com>2014-05-29 00:09:16 -0700
commit805a876af7261cbe11498ae544add0bc8ad74192 (patch)
tree1335f3b6228bb16fa832e7e756e593aa62beb924 /drivers/input
parentDTS: ARM: OMAP3-N900: Add tsc2005 support (diff)
downloadlinux-dev-805a876af7261cbe11498ae544add0bc8ad74192.tar.xz
linux-dev-805a876af7261cbe11498ae544add0bc8ad74192.zip
Input: wacom - set stylus_in_proximity when pen is in range
Signed-off-by: Ping Cheng <pingc@wacom.com> Reviewed-by: Jason Gerecke <killertofu@gmail.com> Tested-by: Jason Gerecke <killertofu@gmail.com> Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com>
Diffstat (limited to 'drivers/input')
-rw-r--r--drivers/input/tablet/wacom_wac.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/input/tablet/wacom_wac.c b/drivers/input/tablet/wacom_wac.c
index 24c0733cf7e5..c98e51c5591f 100644
--- a/drivers/input/tablet/wacom_wac.c
+++ b/drivers/input/tablet/wacom_wac.c
@@ -484,6 +484,8 @@ static int wacom_intuos_inout(struct wacom_wac *wacom)
input_report_key(input, BTN_TOUCH, 0);
input_report_abs(input, ABS_PRESSURE, 0);
input_report_abs(input, ABS_DISTANCE, wacom->features.distance_max);
+ if (features->quirks & WACOM_QUIRK_MULTI_INPUT)
+ wacom->shared->stylus_in_proximity = true;
}
/* Exit report */