From: Sonic Zhang Date: Tue, 13 Mar 2012 07:51:55 +0000 (+0800) Subject: serial: bfin-uart: Don't access tty circular buffer in TX DMA interrupt after it... X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=60f4b002ab209525c2b818703291ac9a14890e17;p=GitHub%2Fexynos8895%2Fandroid_kernel_samsung_universal8895.git serial: bfin-uart: Don't access tty circular buffer in TX DMA interrupt after it is reset. When kernel reboot, tty circular buffer is reset before last TX DMA interrupt is called, while the buffer tail is updated in TX DMA interrupt handler. So, don't update the buffer tail if it is reset. Signed-off-by: Sonic Zhang Signed-off-by: Greg Kroah-Hartman --- diff --git a/drivers/tty/serial/bfin_uart.c b/drivers/tty/serial/bfin_uart.c index 26953bfa6922..5832fdef11e9 100644 --- a/drivers/tty/serial/bfin_uart.c +++ b/drivers/tty/serial/bfin_uart.c @@ -535,11 +535,13 @@ static irqreturn_t bfin_serial_dma_tx_int(int irq, void *dev_id) * when start a new tx. */ UART_CLEAR_IER(uart, ETBEI); - xmit->tail = (xmit->tail + uart->tx_count) & (UART_XMIT_SIZE - 1); uart->port.icount.tx += uart->tx_count; + if (!uart_circ_empty(xmit)) { + xmit->tail = (xmit->tail + uart->tx_count) & (UART_XMIT_SIZE - 1); - if (uart_circ_chars_pending(xmit) < WAKEUP_CHARS) - uart_write_wakeup(&uart->port); + if (uart_circ_chars_pending(xmit) < WAKEUP_CHARS) + uart_write_wakeup(&uart->port); + } bfin_serial_dma_tx_chars(uart); }