---

yaml --- r: 146302 b: refs/heads/master c: 5fc5b42 h: refs/heads/master v: v3
git-mirror · Jun 11, 2009 · c279e3c · c279e3c
1 parent ec20946
commit c279e3c
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git 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
@@ -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