diff options
| author | Peter Hurley <peter@hurleysoftware.com> | 2016-04-10 07:14:37 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2016-04-30 18:26:55 +0200 |
| commit | d1f981506b38933e9ba4cfe01ae98bcd5d3792f9 (patch) | |
| tree | 154259fd15b8b261fdc048fdd39bf25fb1449b2d /drivers/tty | |
| parent | serial: 8250: Extract IIR logic steering from rx dma (diff) | |
| download | linux-d1f981506b38933e9ba4cfe01ae98bcd5d3792f9.tar.xz linux-d1f981506b38933e9ba4cfe01ae98bcd5d3792f9.zip | |
serial: omap8250: Terminate rx dma only for flushes
DMA completed normally does not require termination; only terminate
paused rx dma stemming from rx dma flush.
Signed-off-by: Peter Hurley <peter@hurleysoftware.com>
Reviewed-by: Heikki Krogerus <heikki.krogerus@linux.intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/tty')
| -rw-r--r-- | drivers/tty/serial/8250/8250_omap.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/tty/serial/8250/8250_omap.c b/drivers/tty/serial/8250/8250_omap.c index 8579b0ced093..2c44c792d586 100644 --- a/drivers/tty/serial/8250/8250_omap.c +++ b/drivers/tty/serial/8250/8250_omap.c @@ -767,7 +767,6 @@ static void __dma_rx_do_complete(struct uart_8250_port *p) dma->rx_running = 0; dmaengine_tx_status(dma->rxchan, dma->rx_cookie, &state); - dmaengine_terminate_all(dma->rxchan); count = dma->rx_size - state.residue; @@ -808,6 +807,7 @@ static void omap_8250_rx_dma_flush(struct uart_8250_port *p) spin_unlock_irqrestore(&priv->rx_dma_lock, flags); __dma_rx_do_complete(p); + dmaengine_terminate_all(dma->rxchan); } static int omap_8250_rx_dma(struct uart_8250_port *p) |