summaryrefslogtreecommitdiffstats
path: root/drivers/input
diff options
context:
space:
mode:
authorJason Gerecke <killertofu@gmail.com>2012-10-03 17:19:50 -0700
committerDmitry Torokhov <dmitry.torokhov@gmail.com>2012-10-03 23:58:20 -0700
commit9d336daf3b502f594ce18d26a3a009adb2cf3729 (patch)
treebd38fc8a0265b7e6462010a9143526040b3be565 /drivers/input
parent4e90495498cc6f1aa15e7667a695908860938b3e (diff)
downloadop-kernel-dev-9d336daf3b502f594ce18d26a3a009adb2cf3729.zip
op-kernel-dev-9d336daf3b502f594ce18d26a3a009adb2cf3729.tar.gz
Input: wacom - allow any multi-input Intuos device to set prox
The ability to set the proximity flag should apply to any device that has both pen and touch input. Rather than listing classes of devices known to meet this criteria, simply filter on the quirk defining all such devices. Signed-off-by: Jason Gerecke <killertofu@gmail.com> Tested-by: Ping Cheng <pingc@wacom.com> Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com>
Diffstat (limited to 'drivers/input')
-rw-r--r--drivers/input/tablet/wacom_wac.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/input/tablet/wacom_wac.c b/drivers/input/tablet/wacom_wac.c
index ea4068b..b989bbf 100644
--- a/drivers/input/tablet/wacom_wac.c
+++ b/drivers/input/tablet/wacom_wac.c
@@ -331,7 +331,7 @@ static int wacom_intuos_inout(struct wacom_wac *wacom)
/* Enter report */
if ((data[1] & 0xfc) == 0xc0) {
- if (features->type >= INTUOS5S && features->type <= INTUOS5L)
+ if (features->quirks == WACOM_QUIRK_MULTI_INPUT)
wacom->shared->stylus_in_proximity = true;
/* serial number of the tool */
@@ -419,7 +419,7 @@ static int wacom_intuos_inout(struct wacom_wac *wacom)
/* Exit report */
if ((data[1] & 0xfe) == 0x80) {
- if (features->type >= INTUOS5S && features->type <= INTUOS5L)
+ if (features->quirks == WACOM_QUIRK_MULTI_INPUT)
wacom->shared->stylus_in_proximity = false;
/*
OpenPOWER on IntegriCloud