diff options
| author | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2015-01-13 20:53:22 -0800 |
|---|---|---|
| committer | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2015-02-15 15:44:16 -0800 |
| commit | d7c13d3470bcd7fceb7ad53b0fea195f1606a40b (patch) | |
| tree | 0d8ae1f1c43d8d0d21dfb4b09d7c1911f8fc39fb /drivers/input/mouse/alps.c | |
| parent | de3748f66f21642543e6f1acb1002937a8d2de2e (diff) | |
| download | linux-d7c13d3470bcd7fceb7ad53b0fea195f1606a40b.tar.bz2 | |
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.c | 2 |
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) psmouse->vendor = "ALPS"; psmouse->name = dummy.flags & ALPS_DUALPOINT ? "DualPoint TouchPad" : "GlidePoint"; - psmouse->model = dummy.proto_version << 8; + psmouse->model = dummy.proto_version; } return 0; } |