diff options
| author |   Geert Uytterhoeven <geert+renesas@glider.be> | 2018-07-06 11:08:36 +0200 |
|---|---|---|
| committer |   Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2018-07-06 16:41:15 +0200 |
| commit | c5a9262fa8bfed0dddc7466ef10fcd292e2af61b (patch) | |
| tree | bac315bdd7e5aa4435505e477fb8ee96c4bdc326 /drivers/tty/serial/sh-sci.c | |
| parent | Merge 4.18-rc3 into tty-next (diff) | |
| download | linux-dev-c5a9262fa8bfed0dddc7466ef10fcd292e2af61b.tar.xz linux-dev-c5a9262fa8bfed0dddc7466ef10fcd292e2af61b.zip | |
serial: sh-sci: Stop RX FIFO timer during port shutdown
The RX FIFO timer may be armed when the port is shut down, hence the
timer function may still be called afterwards.
Fix this race condition by deleting the timer during port shutdown.
Fixes: 039403765e5da3c6 ("serial: sh-sci: SCIFA/B RX FIFO software timeout")
Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be>
Reviewed-by: Simon Horman <horms+renesas@verge.net.au>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/tty/serial/sh-sci.c')
| -rw-r--r-- | drivers/tty/serial/sh-sci.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/tty/serial/sh-sci.c b/drivers/tty/serial/sh-sci.c index c181eb37f985..3c55600a8236 100644 --- a/drivers/tty/serial/sh-sci.c +++ b/drivers/tty/serial/sh-sci.c @@ -2099,6 +2099,8 @@ static void sci_shutdown(struct uart_port *port) } #endif + if (s->rx_trigger > 1 && s->rx_fifo_timeout > 0) + del_timer_sync(&s->rx_fifo_timer); sci_free_irq(s); sci_free_dma(port); } |