Skip to content

Commit

Permalink
Input: wacom - fix wacom->shared guards for dual input devices
Browse files Browse the repository at this point in the history
features->quirks can have multiple bits set. For dual input, we only
need to check WACOM_QUIRK_MULTI_INPUT.

Reviewed-by: Jason Gerecke <killertofu@gmail.com>
Signed-off-by: Ping Cheng <pingc@wacom.com>
Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com>
  • Loading branch information
Ping Cheng authored and Dmitry Torokhov committed Jan 21, 2014
1 parent 02300bd commit 7134816
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->quirks == WACOM_QUIRK_MULTI_INPUT)
if (features->quirks & WACOM_QUIRK_MULTI_INPUT)
wacom->shared->stylus_in_proximity = true;

/* serial number of the tool */
Expand Down Expand Up @@ -436,7 +436,7 @@ static int wacom_intuos_inout(struct wacom_wac *wacom)

/* Exit report */
if ((data[1] & 0xfe) == 0x80) {
if (features->quirks == WACOM_QUIRK_MULTI_INPUT)
if (features->quirks & WACOM_QUIRK_MULTI_INPUT)
wacom->shared->stylus_in_proximity = false;

/*
Expand Down

0 comments on commit 7134816

Please sign in to comment.