Messages in this thread Patch in this message | | | Subject | [PATCH 1/1] One more: Fix libps2 timeout handling | Date | Fri, 28 Jan 2005 12:26:26 +0100 | From | Vojtech Pavlik <> |
| |
You can pull this changeset from: bk://kernel.bkbits.net/vojtech/for-linus
===================================================================
ChangeSet@1.1978, 2005-01-28 02:01:34-05:00, dtor_core@ameritech.net Input: libps2 - fix timeout handling in ps2_command, switch to using wait_event_timeout instead of wait_event_interruptible_timeout now that first form is available. Signed-off-by: Dmitry Torokhov <dtor@mail.ru>
libps2.c | 22 +++++++++++----------- 1 files changed, 11 insertions(+), 11 deletions(-)
===================================================================
diff -Nru a/drivers/input/serio/libps2.c b/drivers/input/serio/libps2.c --- a/drivers/input/serio/libps2.c 2005-01-28 12:24:29 +01:00 +++ b/drivers/input/serio/libps2.c 2005-01-28 12:24:29 +01:00 @@ -60,9 +60,9 @@ serio_continue_rx(ps2dev->serio); if (serio_write(ps2dev->serio, byte) == 0) - wait_event_interruptible_timeout(ps2dev->wait, - !(ps2dev->flags & PS2_FLAG_ACK), - msecs_to_jiffies(timeout)); + wait_event_timeout(ps2dev->wait, + !(ps2dev->flags & PS2_FLAG_ACK), + msecs_to_jiffies(timeout)); serio_pause_rx(ps2dev->serio); ps2dev->flags &= ~PS2_FLAG_ACK; @@ -115,8 +115,8 @@ */ timeout = msecs_to_jiffies(command == PS2_CMD_RESET_BAT ? 4000 : 500); - wait_event_interruptible_timeout(ps2dev->wait, - !(ps2dev->flags & PS2_FLAG_CMD1), timeout); + timeout = wait_event_timeout(ps2dev->wait, + !(ps2dev->flags & PS2_FLAG_CMD1), timeout); if (ps2dev->cmdcnt && timeout > 0) { @@ -147,8 +147,8 @@ serio_continue_rx(ps2dev->serio); } - wait_event_interruptible_timeout(ps2dev->wait, - !(ps2dev->flags & PS2_FLAG_CMD), timeout); + wait_event_timeout(ps2dev->wait, + !(ps2dev->flags & PS2_FLAG_CMD), timeout); } if (param) @@ -259,7 +259,7 @@ ps2dev->flags |= PS2_FLAG_CMD | PS2_FLAG_CMD1; ps2dev->flags &= ~PS2_FLAG_ACK; - wake_up_interruptible(&ps2dev->wait); + wake_up(&ps2dev->wait); if (data != PS2_RET_ACK) ps2_handle_response(ps2dev, data); @@ -281,12 +281,12 @@ if (ps2dev->flags & PS2_FLAG_CMD1) { ps2dev->flags &= ~PS2_FLAG_CMD1; if (ps2dev->cmdcnt) - wake_up_interruptible(&ps2dev->wait); + wake_up(&ps2dev->wait); } if (!ps2dev->cmdcnt) { ps2dev->flags &= ~PS2_FLAG_CMD; - wake_up_interruptible(&ps2dev->wait); + wake_up(&ps2dev->wait); } return 1; @@ -298,7 +298,7 @@ ps2dev->nak = 1; if (ps2dev->flags & (PS2_FLAG_ACK | PS2_FLAG_CMD)) - wake_up_interruptible(&ps2dev->wait); + wake_up(&ps2dev->wait); ps2dev->flags = 0; } - To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
| |