From f32a82efb853512ba9556b995b09c7a055e0eeaa Mon Sep 17 00:00:00 2001 From: Dmitry Torokhov Date: Thu, 28 May 2009 09:51:31 -0700 Subject: [PATCH] --- yaml --- r: 145365 b: refs/heads/master c: a3ce6ea46cc0d6397d1b92b1a5983bb2935306ed h: refs/heads/master i: 145363: 92381372bcd073679f6a63435f926fd6e37f8f00 v: v3 --- [refs] | 2 +- trunk/drivers/input/serio/libps2.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 43302a7a116a..41cef7d9e88c 100644 --- 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 index 67248c31e19a..be5bbbb8ae4e 100644 --- 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,