diff mbox

Input: wacom - Fix wacom->shared guards for dual input devices

Message ID 1389823457-3649-1-git-send-email-pingc@wacom.com (mailing list archive)
State New, archived
Headers show

Commit Message

Ping Cheng Jan. 15, 2014, 10:04 p.m. UTC 
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>
---
 drivers/input/tablet/wacom_wac.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Comments

Dmitry Torokhov Jan. 17, 2014, 12:28 a.m. UTC | #1 
On Wed, Jan 15, 2014 at 02:04:17PM -0800, Ping Cheng wrote:
> 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>

Applied, thank you.

> ---
>  drivers/input/tablet/wacom_wac.c | 4 ++--
>  1 file changed, 2 insertions(+), 2 deletions(-)
> 
> diff --git a/drivers/input/tablet/wacom_wac.c b/drivers/input/tablet/wacom_wac.c
> index 048e5b3..0bcc7a6 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->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;
>  
>  		/*
> -- 
> 1.8.3.2
>
diff mbox

Patch

diff --git a/drivers/input/tablet/wacom_wac.c b/drivers/input/tablet/wacom_wac.c
index 048e5b3..0bcc7a6 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->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;
 
 		/*