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

Commit 39b3d892 authored by Peter Hurley's avatar Peter Hurley Committed by Greg Kroah-Hartman
Browse files

serial: core: Use tty->index for port # in debug messages 



The uart port may have already been removed by uart_remove_one_port();
use equivalent tty->index (which is always valid in these contexts)
instead.

Signed-off-by: default avatarPeter Hurley <peter@hurleysoftware.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 3abe8c76

drivers/tty/serial/serial_core.c

+2 −3
Original line number Diff line number Diff line
@@ -1381,8 +1381,7 @@ static void uart_close(struct tty_struct *tty, struct file *filp) 


	uport = state->uart_port;

	port = &state->port;



	pr_debug("uart_close(%d) called\n", uport ? uport->line : -1);

	pr_debug("uart_close(%d) called\n", tty->index);



	if (!port->count || tty_port_close_start(port, tty, filp) == 0)

		return;
@@ -1500,7 +1499,7 @@ static void uart_hangup(struct tty_struct *tty) 
	struct tty_port *port = &state->port;

	unsigned long flags;



	pr_debug("uart_hangup(%d)\n", state->uart_port->line);

	pr_debug("uart_hangup(%d)\n", tty->index);



	mutex_lock(&port->mutex);

	if (port->flags & ASYNC_NORMAL_ACTIVE) {