diff options
author | Jiri Slaby <jslaby@suse.cz> | 2012-06-04 07:35:24 -0400 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2012-06-12 18:50:24 -0400 |
commit | a1e844036af9cb0d87e878a4f90ce64713c76e5a (patch) | |
tree | f9294fbe861fae68493f93648ed5d6350e3d7fe9 /net/irda | |
parent | 0ba9ff846b2f4720e30ace37b028ef14fb97fb74 (diff) |
TTY: ircomm, use tty_port_close_end helper
Again, the code is identical, so leverage the helper code.
Signed-off-by: Jiri Slaby <jslaby@suse.cz>
Cc: Samuel Ortiz <samuel@sortiz.org>
Cc: netdev@vger.kernel.org
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'net/irda')
-rw-r--r-- | net/irda/ircomm/ircomm_tty.c | 16 |
1 files changed, 1 insertions, 15 deletions
diff --git a/net/irda/ircomm/ircomm_tty.c b/net/irda/ircomm/ircomm_tty.c index 3fdce18c6931..cfe352dfb484 100644 --- a/net/irda/ircomm/ircomm_tty.c +++ b/net/irda/ircomm/ircomm_tty.c | |||
@@ -568,21 +568,7 @@ static void ircomm_tty_close(struct tty_struct *tty, struct file *filp) | |||
568 | tty_driver_flush_buffer(tty); | 568 | tty_driver_flush_buffer(tty); |
569 | tty_ldisc_flush(tty); | 569 | tty_ldisc_flush(tty); |
570 | 570 | ||
571 | spin_lock_irqsave(&port->lock, flags); | 571 | tty_port_close_end(port, tty); |
572 | tty->closing = 0; | ||
573 | |||
574 | if (port->blocked_open) { | ||
575 | if (port->close_delay) { | ||
576 | spin_unlock_irqrestore(&port->lock, flags); | ||
577 | schedule_timeout_interruptible(port->close_delay); | ||
578 | spin_lock_irqsave(&port->lock, flags); | ||
579 | } | ||
580 | wake_up_interruptible(&port->open_wait); | ||
581 | } | ||
582 | |||
583 | port->flags &= ~(ASYNC_NORMAL_ACTIVE|ASYNC_CLOSING); | ||
584 | spin_unlock_irqrestore(&port->lock, flags); | ||
585 | wake_up_interruptible(&port->close_wait); | ||
586 | tty_port_tty_set(port, NULL); | 572 | tty_port_tty_set(port, NULL); |
587 | } | 573 | } |
588 | 574 | ||