---

yaml --- r: 145365 b: refs/heads/master c: a3ce6ea h: refs/heads/master i: 145363: 9238137 v: v3
git-mirror · May 28, 2009 · f32a82e · f32a82e
1 parent 8226e2b
commit f32a82e
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 346a850e3c3a20159cef2b79235e6d34aa497c65
+refs/heads/master: a3ce6ea46cc0d6397d1b92b1a5983bb2935306ed
diff --git a/trunk/drivers/input/serio/libps2.c b/trunk/drivers/input/serio/libps2.c
@@ -210,7 +210,7 @@ int ps2_command(struct ps2dev *ps2dev, unsigned char *param, int command)
 	timeout = wait_event_timeout(ps2dev->wait,
 				     !(ps2dev->flags & PS2_FLAG_CMD1), timeout);
 
-	if (ps2dev->cmdcnt && timeout > 0) {
+	if (ps2dev->cmdcnt && !(ps2dev->flags & PS2_FLAG_CMD1)) {
 
 		timeout = ps2_adjust_timeout(ps2dev, command, timeout);
 		wait_event_timeout(ps2dev->wait,