]> git.proxmox.com Git - mirror_ubuntu-disco-kernel.git/commitdiff
Input: alps - fix a mismatch between a condition check and its comment
authorHui Wang <hui.wang@canonical.com>
Fri, 19 Jul 2019 14:39:17 +0000 (22:39 +0800)
committerStefan Bader <stefan.bader@canonical.com>
Tue, 13 Aug 2019 12:18:20 +0000 (14:18 +0200)
BugLink: https://bugs.launchpad.net/bugs/1836752
In the function alps_is_cs19_trackpoint(), we check if the param[1] is
in the 0x20~0x2f range, but the code we wrote for this checking is not
correct:
(param[1] & 0x20) does not mean param[1] is in the range of 0x20~0x2f,
it also means the param[1] is in the range of 0x30~0x3f, 0x60~0x6f...

Now fix it with a new condition checking ((param[1] & 0xf0) == 0x20).

Fixes: 7e4935ccc323 ("Input: alps - don't handle ALPS cs19 trackpoint-only device")
Cc: stable@vger.kernel.org
Signed-off-by: Hui Wang <hui.wang@canonical.com>
Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com>
(cherry picked from commit 771a081e44a9baa1991ef011cc453ef425591740)
Signed-off-by: Hui Wang <hui.wang@canonical.com>
Acked-by: Stefan Bader <stefan.bader@canonical.com>
Acked-by: Seth Forshee <seth.forshee@canonical.com>
Signed-off-by: Khalid Elmously <khalid.elmously@canonical.com>
drivers/input/mouse/alps.c

index 11a4363c3b60ffa706af87833490e817ebd5efc8..dd80ff6cc4273079fa8f75806d89df97e914fa01 100644 (file)
@@ -2879,7 +2879,7 @@ static bool alps_is_cs19_trackpoint(struct psmouse *psmouse)
         * trackpoint-only devices have their variant_ids equal
         * TP_VARIANT_ALPS and their firmware_ids are in 0x20~0x2f range.
         */
-       return param[0] == TP_VARIANT_ALPS && (param[1] & 0x20);
+       return param[0] == TP_VARIANT_ALPS && ((param[1] & 0xf0) == 0x20);
 }
 
 static int alps_identify(struct psmouse *psmouse, struct alps_data *priv)