Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a1e84403 authored by Jiri Slaby's avatar Jiri Slaby Committed by Greg Kroah-Hartman
Browse files

TTY: ircomm, use tty_port_close_end helper 



Again, the code is identical, so leverage the helper code.

Signed-off-by: default avatarJiri Slaby <jslaby@suse.cz>
Cc: Samuel Ortiz <samuel@sortiz.org>
Cc: netdev@vger.kernel.org
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 0ba9ff84

net/irda/ircomm/ircomm_tty.c

+1 −15
Original line number Diff line number Diff line
@@ -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);

}