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 23212af7fa7677c20864a5e9d8dae0f33bb39ea3..f70660465a54f84bfe3bb97d64cbd5b0e11fd7e0 100644 (file)
--- 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);