Skip to content

Commit

Permalink
Input: wacom - allow any multi-input Intuos device to set prox
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Jason Gerecke authored and Dmitry Torokhov committed Oct 4, 2012
1 parent 4e90495 commit 9d336da
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions drivers/input/tablet/wacom_wac.c
Original file line number Diff line number Diff line change
Expand Up @@ -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 */
Expand Down Expand Up @@ -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;

/*
Expand Down

0 comments on commit 9d336da

Please sign in to comment.