]> git.proxmox.com Git - mirror_ubuntu-zesty-kernel.git/commitdiff
Input: ALPS - fix command mode check
authorKevin Cernekee <cernekee@gmail.com>
Thu, 14 Feb 2013 06:24:22 +0000 (22:24 -0800)
committerDmitry Torokhov <dmitry.torokhov@gmail.com>
Thu, 14 Feb 2013 17:18:16 +0000 (09:18 -0800)
Pinnacle class devices should return "88 07 xx" or "88 08 xx" when
entering command mode.  If either the first byte or the second byte is
invalid, return an error.

Signed-off-by: Kevin Cernekee <cernekee@gmail.com>
Tested-by: Dave Turvene <dturvene@dahetral.com>
Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com>
drivers/input/mouse/alps.c

index eafeae2793561bceada5b20fb38aa3b872054229..bfc193806fc1a3e83f64cb78cd60742680ca0060 100644 (file)
@@ -983,7 +983,7 @@ static int alps_enter_command_mode(struct psmouse *psmouse,
                return -1;
        }
 
-       if (param[0] != 0x88 && param[1] != 0x07) {
+       if (param[0] != 0x88 || (param[1] != 0x07 && param[1] != 0x08)) {
                psmouse_dbg(psmouse,
                            "unknown response while entering command mode\n");
                return -1;