diff options
| author | Luka Pivk <luka.pivk@toradex.com> | 2018-11-29 14:34:22 +0100 |
|---|---|---|
| committer | Luka Pivk <luka.pivk@toradex.com> | 2018-11-29 14:34:31 +0100 |
| commit | 8b1f65e4372b5673503826af5c57bb5c624acc3e (patch) | |
| tree | dc7076a28acb3bbf3fb2d04da74a829053c48195 /drivers/tty | |
| parent | a4805e5a2f40a7ec1d7a17ad05067b3d88340017 (diff) | |
| parent | b32d16ec995683be888520d12d8f2833efee5dae (diff) | |
Merge remote-tracking branch 'origin/linux-4.19.y' into toradex_4_19.y
Signed-off-by: Luka Pivk <luka.pivk@toradex.com>
Diffstat (limited to 'drivers/tty')
| -rw-r--r-- | drivers/tty/serial/sh-sci.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/tty/serial/sh-sci.c b/drivers/tty/serial/sh-sci.c index 3649b83ef863..effba6ce0caa 100644 --- a/drivers/tty/serial/sh-sci.c +++ b/drivers/tty/serial/sh-sci.c @@ -1614,10 +1614,10 @@ static void sci_request_dma(struct uart_port *port) hrtimer_init(&s->rx_timer, CLOCK_MONOTONIC, HRTIMER_MODE_REL); s->rx_timer.function = rx_timer_fn; + s->chan_rx_saved = s->chan_rx = chan; + if (port->type == PORT_SCIFA || port->type == PORT_SCIFB) sci_submit_rx(s); - - s->chan_rx_saved = s->chan_rx = chan; } } |