serial: 8250_dma: no need to set tx_err twice
authorAndy Shevchenko <andriy.shevchenko@linux.intel.com>
Thu, 6 Nov 2014 11:28:17 +0000 (13:28 +0200)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Thu, 6 Nov 2014 23:01:03 +0000 (15:01 -0800)
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 <andriy.shevchenko@linux.intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/tty/serial/8250/8250_dma.c

index b16f9b169202abbc626ca3454b3950227504853f..fcd7ac6af2fc25339600b5059a658ea052f14b91 100644 (file)
@@ -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;