From 139246e30eeb7e000e6283be39fabe022c268d52 Mon Sep 17 00:00:00 2001 From: Sonic Zhang Date: Wed, 16 May 2012 14:22:24 +0800 Subject: [PATCH] --- yaml --- r: 304231 b: refs/heads/master c: 239c25b1a03cf57193b9a52623deb918adf6132e h: refs/heads/master i: 304229: 2fe7ece9bc26da05622d4c2d40be05f08b39f31f 304227: 59803ad794dc1d07c9fa4f184f71d64acd977ba0 304223: 13972becd773a2e738ed1add278b2d788a7449ff v: v3 --- [refs] | 2 +- trunk/drivers/tty/serial/bfin_uart.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 15fde4428059..d9b2a0389660 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: b06d2f20cdf57841b309d30d895b1fd502655e48 +refs/heads/master: 239c25b1a03cf57193b9a52623deb918adf6132e diff --git a/trunk/drivers/tty/serial/bfin_uart.c b/trunk/drivers/tty/serial/bfin_uart.c index 9acab114d804..56b95b0447d9 100644 --- a/trunk/drivers/tty/serial/bfin_uart.c +++ b/trunk/drivers/tty/serial/bfin_uart.c @@ -532,7 +532,7 @@ static irqreturn_t bfin_serial_dma_tx_int(int irq, void *dev_id) */ UART_CLEAR_IER(uart, ETBEI); uart->port.icount.tx += uart->tx_count; - if (!uart_circ_empty(xmit)) { + if (!(xmit->tail == 0 && xmit->head == 0)) { xmit->tail = (xmit->tail + uart->tx_count) & (UART_XMIT_SIZE - 1); if (uart_circ_chars_pending(xmit) < WAKEUP_CHARS)