From c344f0d1cc6f31472ee31bde5e6df45cd9c929f1 Mon Sep 17 00:00:00 2001 From: Itai Levi Date: Thu, 15 Jan 2009 13:50:43 -0800 Subject: [PATCH] --- yaml --- r: 129654 b: refs/heads/master c: 1f14081d8b31b2780e2e6e2ae2766264e1f7d38b h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/serial/atmel_serial.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 39ebf947af83..9f56aa943965 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: db0fb1848a645b0b1b033765f3a5244e7afd2e3c +refs/heads/master: 1f14081d8b31b2780e2e6e2ae2766264e1f7d38b diff --git a/trunk/drivers/serial/atmel_serial.c b/trunk/drivers/serial/atmel_serial.c index d5efd6c77904..89362d733d62 100644 --- a/trunk/drivers/serial/atmel_serial.c +++ b/trunk/drivers/serial/atmel_serial.c @@ -579,7 +579,7 @@ static void atmel_tx_dma(struct uart_port *port) /* disable PDC transmit */ UART_PUT_PTCR(port, ATMEL_PDC_TXTDIS); - if (!uart_circ_empty(xmit)) { + if (!uart_circ_empty(xmit) && !uart_tx_stopped(port)) { dma_sync_single_for_device(port->dev, pdc->dma_addr, pdc->dma_size,