[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Date: Tue, 10 Oct 2017 21:51:04 +0200
From: Greg Kroah-Hartman <gregkh@...uxfoundation.org>
To: linux-kernel@...r.kernel.org
Cc: Greg Kroah-Hartman <gregkh@...uxfoundation.org>,
stable@...r.kernel.org, Ping Cheng <ping.cheng@...om.com>,
Matthieu Robin <matthieu@...olu.org>,
Jiri Kosina <jkosina@...e.cz>,
Jason Gerecke <killertofu@...il.com>
Subject: [PATCH 4.13 136/160] HID: wacom: bits shifted too much for 9th and 10th buttons
4.13-stable review patch. If anyone has any objections, please let me know.
------------------
From: Ping Cheng <pinglinux@...il.com>
commit ce06760ba46b66dae50f2519ae76bd15e89b5710 upstream.
Cintiq 12 has 10 expresskey buttons. The bit shift for the last
two buttons were off by 5.
Fixes: c7f0522 ("HID: wacom: Slim down wacom_intuos_pad processing")
Signed-off-by: Ping Cheng <ping.cheng@...om.com>
Tested-by: Matthieu Robin <matthieu@...olu.org>
Signed-off-by: Jiri Kosina <jkosina@...e.cz>
Cc: Jason Gerecke <killertofu@...il.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@...uxfoundation.org>
---
drivers/hid/wacom_wac.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
--- a/drivers/hid/wacom_wac.c
+++ b/drivers/hid/wacom_wac.c
@@ -567,8 +567,8 @@ static int wacom_intuos_pad(struct wacom
keys = data[9] & 0x07;
}
} else {
- buttons = ((data[6] & 0x10) << 10) |
- ((data[5] & 0x10) << 9) |
+ buttons = ((data[6] & 0x10) << 5) |
+ ((data[5] & 0x10) << 4) |
((data[6] & 0x0F) << 4) |
(data[5] & 0x0F);
}
Powered by blists - more mailing lists