From: Peter Hurley Date: Sun, 10 Apr 2016 05:14:37 +0000 (-0700) Subject: serial: omap8250: Terminate rx dma only for flushes X-Git-Tag: v4.7-rc1~94^2~21 X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=d1f981506b38933e9ba4cfe01ae98bcd5d3792f9;p=karo-tx-linux.git 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 Reviewed-by: Heikki Krogerus Signed-off-by: Greg Kroah-Hartman --- 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)