From: Jiri Slaby Date: Mon, 5 Mar 2012 13:52:48 +0000 (+0100) Subject: TTY: amiserial, use tty_port_close_end X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=b8edebe4b8b4ad5bd436cf9080b77b29e219029a;p=~shefty%2Frdma-dev.git TTY: amiserial, use tty_port_close_end Hmm, the code was sleeping with interrupts disabled. This was not good. Fix this by turning interrupts at an appropriate place. (The race is protected by CLOSING flag.) After the move, the code is identical to tty_port_close_end, so use it! Signed-off-by: Jiri Slaby Cc: Geert Uytterhoeven Signed-off-by: Greg Kroah-Hartman --- diff --git a/drivers/tty/amiserial.c b/drivers/tty/amiserial.c index 8cc8e15c74d..9c8b199bad3 100644 --- a/drivers/tty/amiserial.c +++ b/drivers/tty/amiserial.c @@ -1433,6 +1433,7 @@ static void rs_close(struct tty_struct *tty, struct file * filp) * the line discipline to only process XON/XOFF characters. */ tty->closing = 1; + local_irq_restore(flags); if (port->closing_wait != ASYNC_CLOSING_WAIT_NONE) tty_wait_until_sent(tty, port->closing_wait); /* @@ -1461,17 +1462,9 @@ static void rs_close(struct tty_struct *tty, struct file * filp) rs_flush_buffer(tty); tty_ldisc_flush(tty); - tty->closing = 0; port->tty = NULL; - if (port->blocked_open) { - if (port->close_delay) { - msleep_interruptible(jiffies_to_msecs(port->close_delay)); - } - wake_up_interruptible(&port->open_wait); - } - port->flags &= ~(ASYNC_NORMAL_ACTIVE|ASYNC_CLOSING); - wake_up_interruptible(&port->close_wait); - local_irq_restore(flags); + + tty_port_close_end(port, tty); } /*