diff options
| author | Johan Hovold <jhovold@gmail.com> | 2013-09-10 12:50:48 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2013-10-05 07:13:10 -0700 |
| commit | 64dc8de491ef490e979fe65d83daaadf32c83633 (patch) | |
| tree | 2a1b5c71fe1acadaa184c03bc353f7be95db0bc8 /drivers/tty | |
| parent | fe0da74501e9eb204dc1b8167708bd9273f4277f (diff) | |
| download | linux-3.10-64dc8de491ef490e979fe65d83daaadf32c83633.tar.gz linux-3.10-64dc8de491ef490e979fe65d83daaadf32c83633.tar.bz2 linux-3.10-64dc8de491ef490e979fe65d83daaadf32c83633.zip | |
serial: tegra: fix tty-kref leak
commit cfd29aa0e81b791985e8428e6507e80e074e6730 upstream.
Fix potential tty-kref leak in stop_rx path.
Signed-off-by: Johan Hovold <jhovold@gmail.com>
Tested-by: Stephen Warren <swarren@nvidia.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/tty')
| -rw-r--r-- | drivers/tty/serial/serial-tegra.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/tty/serial/serial-tegra.c b/drivers/tty/serial/serial-tegra.c index 9799d043a9b..357a8370ce2 100644 --- a/drivers/tty/serial/serial-tegra.c +++ b/drivers/tty/serial/serial-tegra.c @@ -726,7 +726,7 @@ static irqreturn_t tegra_uart_isr(int irq, void *data) static void tegra_uart_stop_rx(struct uart_port *u) { struct tegra_uart_port *tup = to_tegra_uport(u); - struct tty_struct *tty = tty_port_tty_get(&tup->uport.state->port); + struct tty_struct *tty; struct tty_port *port = &u->state->port; struct dma_tx_state state; unsigned long ier; @@ -738,6 +738,8 @@ static void tegra_uart_stop_rx(struct uart_port *u) if (!tup->rx_in_progress) return; + tty = tty_port_tty_get(&tup->uport.state->port); + tegra_uart_wait_sym_time(tup, 1); /* wait a character interval */ ier = tup->ier_shadow; |