aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/input/mouse/alps.c
diff options
context:
space:
mode:
authorDmitry Torokhov <dmitry.torokhov@gmail.com>2015-01-13 23:53:22 -0500
committerDmitry Torokhov <dmitry.torokhov@gmail.com>2015-02-15 18:44:16 -0500
commitd7c13d3470bcd7fceb7ad53b0fea195f1606a40b (patch)
tree0d8ae1f1c43d8d0d21dfb4b09d7c1911f8fc39fb /drivers/input/mouse/alps.c
parentde3748f66f21642543e6f1acb1002937a8d2de2e (diff)
Input: ALPS - renumber protocol numbers
In order to accommodate new protocol number for Rushmore touchpads let's shift protocol numbers by 8 bits (i.e. 1 -> 0x100) - this way we keep protocol version reported in input device id the same as it was, but add some holes in numbering. Tested-by: Pali Rohár <pali.rohar@gmail.com> Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com>
Diffstat (limited to 'drivers/input/mouse/alps.c')
-rw-r--r--drivers/input/mouse/alps.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/input/mouse/alps.c b/drivers/input/mouse/alps.c
index f205b8be2ce4..92a886b0eca4 100644
--- a/drivers/input/mouse/alps.c
+++ b/drivers/input/mouse/alps.c
@@ -2526,7 +2526,7 @@ int alps_detect(struct psmouse *psmouse, bool set_properties)
2526 psmouse->vendor = "ALPS"; 2526 psmouse->vendor = "ALPS";
2527 psmouse->name = dummy.flags & ALPS_DUALPOINT ? 2527 psmouse->name = dummy.flags & ALPS_DUALPOINT ?
2528 "DualPoint TouchPad" : "GlidePoint"; 2528 "DualPoint TouchPad" : "GlidePoint";
2529 psmouse->model = dummy.proto_version << 8; 2529 psmouse->model = dummy.proto_version;
2530 } 2530 }
2531 return 0; 2531 return 0;
2532} 2532}