summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndy Shevchenko <andriy.shevchenko@linux.intel.com>2014-11-06 12:28:17 +0100
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2014-11-07 00:01:03 +0100
commitb1835d238ad3dc6ad8fe23172b1995d1fb5bdd39 (patch)
treed7a9e614d6ede05a5dce845ae10fa8a577b223e7
parentserial: 8250_dma: call serial8250_tx_dma unconditionally (diff)
downloadlinux-b1835d238ad3dc6ad8fe23172b1995d1fb5bdd39.tar.xz
linux-b1835d238ad3dc6ad8fe23172b1995d1fb5bdd39.zip
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 <andriy.shevchenko@linux.intel.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-rw-r--r--drivers/tty/serial/8250/8250_dma.c2
1 files changed, 0 insertions, 2 deletions
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;