serial: 8250_dma: terminate correct DMA in tx_dma_flush()

johnkeeping · gregkh · commit 367a281315ec · 2025-04-07T10:06:37.000+02:00
commit a265030 upstream. When flushing transmit side DMA, it is the transmit channel that should be terminated, not the receive channel. Fixes: 9e512ea ("serial: 8250: Fix fifo underflow on flush") Cc: stable <stable@kernel.org> Reported-by: Wentao Guan <guanwentao@uniontech.com> Signed-off-by: John Keeping <jkeeping@inmusicbrands.com> Reviewed-by: Ilpo Järvinen <ilpo.jarvinen@linux.intel.com> Link: https://lore.kernel.org/r/20250224121831.1429323-1-jkeeping@inmusicbrands.com Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
diff --git a/drivers/tty/serial/8250/8250_dma.c b/drivers/tty/serial/8250/8250_dma.c
@@ -152,7 +152,7 @@ void serial8250_tx_dma_flush(struct uart_8250_port *p)
 	 */
 	dma->tx_size = 0;
 
-	dmaengine_terminate_async(dma->rxchan);
+	dmaengine_terminate_async(dma->txchan);
 }
 
 int serial8250_rx_dma(struct uart_8250_port *p)

Original file line number	Diff line number	Diff line change
`@@ -152,7 +152,7 @@ void serial8250_tx_dma_flush(struct uart_8250_port *p)`
`152`	`152`	`*/`
`153`	`153`	`dma->tx_size = 0;`
`154`	`154`
`155`		`- dmaengine_terminate_async(dma->rxchan);`
	`155`	`+ dmaengine_terminate_async(dma->txchan);`
`156`	`156`	`}`
`157`	`157`
`158`	`158`	`int serial8250_rx_dma(struct uart_8250_port *p)`