From e5305fffee703c28b0b68fc0b576629329b27bda Mon Sep 17 00:00:00 2001 From: Jiri Slaby Date: Mon, 4 Jun 2012 13:35:24 +0200 Subject: [PATCH] --- yaml --- r: 325578 b: refs/heads/master c: a1e844036af9cb0d87e878a4f90ce64713c76e5a h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/net/irda/ircomm/ircomm_tty.c | 16 +--------------- 2 files changed, 2 insertions(+), 16 deletions(-) diff --git a/[refs] b/[refs] index 6522534d1a9f..d8c6759e0906 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 0ba9ff846b2f4720e30ace37b028ef14fb97fb74 +refs/heads/master: a1e844036af9cb0d87e878a4f90ce64713c76e5a diff --git a/trunk/net/irda/ircomm/ircomm_tty.c b/trunk/net/irda/ircomm/ircomm_tty.c index 3fdce18c6931..cfe352dfb484 100644 --- a/trunk/net/irda/ircomm/ircomm_tty.c +++ b/trunk/net/irda/ircomm/ircomm_tty.c @@ -568,21 +568,7 @@ static void ircomm_tty_close(struct tty_struct *tty, struct file *filp) tty_driver_flush_buffer(tty); tty_ldisc_flush(tty); - spin_lock_irqsave(&port->lock, flags); - tty->closing = 0; - - if (port->blocked_open) { - if (port->close_delay) { - spin_unlock_irqrestore(&port->lock, flags); - schedule_timeout_interruptible(port->close_delay); - spin_lock_irqsave(&port->lock, flags); - } - wake_up_interruptible(&port->open_wait); - } - - port->flags &= ~(ASYNC_NORMAL_ACTIVE|ASYNC_CLOSING); - spin_unlock_irqrestore(&port->lock, flags); - wake_up_interruptible(&port->close_wait); + tty_port_close_end(port, tty); tty_port_tty_set(port, NULL); }