From ca99541342c27acd0b60379dd0f49ff31969f629 Mon Sep 17 00:00:00 2001 From: Kevin Cernekee Date: Wed, 13 Feb 2013 22:24:22 -0800 Subject: [PATCH] --- yaml --- r: 350704 b: refs/heads/master c: 56fd340ebb533cb45c5eaf350cf889c43c5911e6 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/input/mouse/alps.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index c49f074c8fc1..111a0f434b24 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: f673ceb11b880e8535476326612e54c3e0cace5b +refs/heads/master: 56fd340ebb533cb45c5eaf350cf889c43c5911e6 diff --git a/trunk/drivers/input/mouse/alps.c b/trunk/drivers/input/mouse/alps.c index eafeae279356..bfc193806fc1 100644 --- a/trunk/drivers/input/mouse/alps.c +++ b/trunk/drivers/input/mouse/alps.c @@ -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;