From c279e3cd3194ddb40a681bdc31c0f3195e967dc1 Mon Sep 17 00:00:00 2001 From: Jiri Slaby Date: Thu, 11 Jun 2009 14:32:42 +0100 Subject: [PATCH] --- yaml --- r: 146302 b: refs/heads/master c: 5fc5b42a3bb564f0b6e03f0f1b522ed9100250ad h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/char/tty_port.c | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index fd50e706d648..520680b93aba 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 4db2299da213d1ba8cf7f4c0a197ae7ba49db5cb +refs/heads/master: 5fc5b42a3bb564f0b6e03f0f1b522ed9100250ad diff --git a/trunk/drivers/char/tty_port.c b/trunk/drivers/char/tty_port.c index 4d08b6d27c28..931af1030740 100644 --- a/trunk/drivers/char/tty_port.c +++ b/trunk/drivers/char/tty_port.c @@ -198,7 +198,8 @@ int tty_port_block_til_ready(struct tty_port *port, /* block if port is in the process of being closed */ if (tty_hung_up_p(filp) || port->flags & ASYNC_CLOSING) { - interruptible_sleep_on(&port->close_wait); + wait_event_interruptible(port->close_wait, + !(port->flags & ASYNC_CLOSING)); if (port->flags & ASYNC_HUP_NOTIFY) return -EAGAIN; else