From: Andy Shevchenko Date: Thu, 6 Nov 2014 11:28:17 +0000 (+0200) Subject: serial: 8250_dma: no need to set tx_err twice X-Git-Tag: firefly_0821_release~176^2~2678^2~55 X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=b1835d238ad3dc6ad8fe23172b1995d1fb5bdd39;p=firefly-linux-kernel-4.4.55.git serial: 8250_dma: no need to set tx_err twice In the serial8250_tx_dma() the tx_err flag is set in case of error. Thus, there is no need to repeat this in __dma_tx_complete(). Signed-off-by: Andy Shevchenko Signed-off-by: Greg Kroah-Hartman --- diff --git a/drivers/tty/serial/8250/8250_dma.c b/drivers/tty/serial/8250/8250_dma.c index b16f9b169202..fcd7ac6af2fc 100644 --- a/drivers/tty/serial/8250/8250_dma.c +++ b/drivers/tty/serial/8250/8250_dma.c @@ -39,7 +39,6 @@ static void __dma_tx_complete(void *param) ret = serial8250_tx_dma(p); if (ret) { - dma->tx_err = 1; p->ier |= UART_IER_THRI; serial_port_out(&p->port, UART_IER, p->ier); } @@ -93,7 +92,6 @@ int serial8250_tx_dma(struct uart_8250_port *p) } dma->tx_running = 1; - desc->callback = __dma_tx_complete; desc->callback_param = p;