From: Jason Gerecke <killertofu@gmail.com>
Date: Wed, 16 Dec 2015 21:37:36 +0000 (-0800)
Subject: HID: wacom: Fix pad button range for CINTIQ_COMPANION_2
X-Git-Url: http://drtracing.org/?a=commitdiff_plain;h=0402b6b77a35205072087d7f774e4c2b2797f8c3;p=deliverable%2Flinux.git

HID: wacom: Fix pad button range for CINTIQ_COMPANION_2

Commit c7f0522 incorrectly constructs the 'buttons' variable for the
CINTIQ_COMPANION_2 case. The high nybble of data[2] is shifted four
bits too far, leaving the bits associated with BTN_7 through BTN_A
unset.

Signed-off-by: Jason Gerecke <jason.gerecke@wacom.com>
Signed-off-by: Jiri Kosina <jkosina@suse.cz>
---

diff --git a/drivers/hid/wacom_wac.c b/drivers/hid/wacom_wac.c
index 23212af7fa76..f70660465a54 100644
--- a/drivers/hid/wacom_wac.c
+++ b/drivers/hid/wacom_wac.c
@@ -516,7 +516,7 @@ static int wacom_intuos_pad(struct wacom_wac *wacom)
 		 * d-pad down   -> data[4] & 0x80
 		 * d-pad center -> data[3] & 0x01
 		 */
-		buttons = ((data[2] & 0xF0) << 7) |
+		buttons = ((data[2] >> 4) << 7) |
 		          ((data[1] & 0x04) << 6) |
 		          ((data[2] & 0x0F) << 2) |
 		          (data[1] & 0x03);