Skip to content

Commit

Permalink
TTY: ircomm, use tty_port_close_end helper
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Jiri Slaby authored and Greg Kroah-Hartman committed Jun 12, 2012
1 parent 0ba9ff8 commit a1e8440
Showing 1 changed file with 1 addition and 15 deletions.
16 changes: 1 addition & 15 deletions net/irda/ircomm/ircomm_tty.c
Original file line number Diff line number Diff line change
Expand Up @@ -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);
}

Expand Down

0 comments on commit a1e8440

Please sign in to comment.