Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 9bdd6369 authored by Andy Shevchenko's avatar Andy Shevchenko Committed by Greg Kroah-Hartman
Browse files

serial: 8250_dma: terminate transfer explicitly when timeout 



There is no need to terminate transfer in the __dma_rx_complete() since it's
called at the end of transfer. Special case when serial timeout occurs is
handled separately where we have to terminate transfer.

Signed-off-by: default avatarAndy Shevchenko <andriy.shevchenko@linux.intel.com>
Reviewed-by: default avatarHeikki Krogerus <heikki.krogerus@linux.intel.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 9e5df9f8

drivers/tty/serial/8250/8250_dma.c

+1 −1
Original line number Diff line number Diff line
@@ -59,7 +59,6 @@ static void __dma_rx_complete(void *param) 


	dma->rx_running = 0;

	dmaengine_tx_status(dma->rxchan, dma->rx_cookie, &state);

	dmaengine_terminate_all(dma->rxchan);



	count = dma->rx_size - state.residue;
@@ -131,6 +130,7 @@ int serial8250_rx_dma(struct uart_8250_port *p, unsigned int iir) 
		if (dma->rx_running) {

			dmaengine_pause(dma->rxchan);

			__dma_rx_complete(p);

			dmaengine_terminate_all(dma->rxchan);

		}

		return -ETIMEDOUT;

	default: