summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDennis Kempin <denniskempin@chromium.org>2013-05-16 13:55:15 -0700
committerPeter Wu <lekensteyn@gmail.com>2013-08-26 15:45:30 +0200
commitca45ff80203552458df8bc3f44dcf94819d2ae8b (patch)
treeaa343bcd408b9a82ddad20e8f2622a52703a9265
parentcf9cade120fd60a0ec14fd91ad65619a418f406b (diff)
downloadlinux-ca45ff80203552458df8bc3f44dcf94819d2ae8b.tar.gz
CHROMIUM: hid-logitech-wtp: Fixed bug which prevents TP from entering raw mode
The command ID has been fixed. BUG=chromium:240850 TEST=manual test with T650 Change-Id: Ie87c0c15313b76a58750b548f8bb63b378915ae6 Signed-off-by: Dennis Kempin <denniskempin@chromium.org> Reviewed-on: https://gerrit.chromium.org/gerrit/57256 Reviewed-by: Andrew de los Reyes <adlr@chromium.org>
-rw-r--r--drivers/hid/hid-logitech-wtp.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/hid/hid-logitech-wtp.c b/drivers/hid/hid-logitech-wtp.c
index ce146668a964..44dbcfa5c576 100644
--- a/drivers/hid/hid-logitech-wtp.c
+++ b/drivers/hid/hid-logitech-wtp.c
@@ -195,9 +195,9 @@ static void generic_parse_mouse_button(struct hidpp_report *report,
*/
#define TPRXY_FEATURE 0x6100
-#define TPRXY_CMD_GET_TOUCHPAD_INFO (0x00 & SOFTWARE_ID)
-#define TPRXY_CMD_GET_RAW_REPORT_STATE (0x10 & SOFTWARE_ID)
-#define TPRXY_CMD_SET_RAW_REPORT_STATE (0x20 & SOFTWARE_ID)
+#define TPRXY_CMD_GET_TOUCHPAD_INFO (0x00 | SOFTWARE_ID)
+#define TPRXY_CMD_GET_RAW_REPORT_STATE (0x10 | SOFTWARE_ID)
+#define TPRXY_CMD_SET_RAW_REPORT_STATE (0x20 | SOFTWARE_ID)
#define TPRXY_EVENT_TOUCHPAD_RAW_TOUCH_POINTS 0x00
#define TPRXY_FORMAT_RAW 0x01