]> Pileus Git - ~andy/linux/commitdiff
Input: wacom - fix wacom->shared guards for dual input devices
authorPing Cheng <pinglinux@gmail.com>
Fri, 17 Jan 2014 00:28:47 +0000 (16:28 -0800)
committerDmitry Torokhov <dmitry.torokhov@gmail.com>
Tue, 21 Jan 2014 04:36:57 +0000 (20:36 -0800)
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>
drivers/input/tablet/wacom_wac.c

index 048e5b38f167ed340ab76f692a494f7ec3bb6a16..0bcc7a634214181aae1a631c1d9f12e8d9888c4f 100644 (file)
@@ -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 */
@@ -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;
 
                /*