2
0
mirror of https://github.com/edk2-porting/linux-next.git synced 2024-12-24 13:13:57 +08:00

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: Peter Hurley <peter@hurleysoftware.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Peter Hurley 2016-01-10 20:23:57 -08:00 committed by Greg Kroah-Hartman
parent 3abe8c7671
commit 39b3d8929f

View File

@ -1381,8 +1381,7 @@ static void uart_close(struct tty_struct *tty, struct file *filp)
uport = state->uart_port; uport = state->uart_port;
port = &state->port; port = &state->port;
pr_debug("uart_close(%d) called\n", tty->index);
pr_debug("uart_close(%d) called\n", uport ? uport->line : -1);
if (!port->count || tty_port_close_start(port, tty, filp) == 0) if (!port->count || tty_port_close_start(port, tty, filp) == 0)
return; return;
@ -1500,7 +1499,7 @@ static void uart_hangup(struct tty_struct *tty)
struct tty_port *port = &state->port; struct tty_port *port = &state->port;
unsigned long flags; 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); mutex_lock(&port->mutex);
if (port->flags & ASYNC_NORMAL_ACTIVE) { if (port->flags & ASYNC_NORMAL_ACTIVE) {