diff options
| author | Ingo Molnar <mingo@elte.hu> | 2009-01-21 10:37:27 -0500 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-01-21 10:37:27 -0500 |
| commit | 77835492ed489c0b870f82f4c50687bd267acc0a (patch) | |
| tree | d80903ce1b8dd30aa44ccfc756616ad4d6c74d63 /drivers/serial/atmel_serial.c | |
| parent | af37501c792107c2bde1524bdae38d9a247b841a (diff) | |
| parent | 1de9e8e70f5acc441550ca75433563d91b269bbe (diff) | |
Merge commit 'v2.6.29-rc2' into perfcounters/core
Conflicts:
include/linux/syscalls.h
Diffstat (limited to 'drivers/serial/atmel_serial.c')
| -rw-r--r-- | drivers/serial/atmel_serial.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/serial/atmel_serial.c b/drivers/serial/atmel_serial.c index d5efd6c77904..89362d733d62 100644 --- a/drivers/serial/atmel_serial.c +++ b/drivers/serial/atmel_serial.c | |||
| @@ -579,7 +579,7 @@ static void atmel_tx_dma(struct uart_port *port) | |||
| 579 | /* disable PDC transmit */ | 579 | /* disable PDC transmit */ |
| 580 | UART_PUT_PTCR(port, ATMEL_PDC_TXTDIS); | 580 | UART_PUT_PTCR(port, ATMEL_PDC_TXTDIS); |
| 581 | 581 | ||
| 582 | if (!uart_circ_empty(xmit)) { | 582 | if (!uart_circ_empty(xmit) && !uart_tx_stopped(port)) { |
| 583 | dma_sync_single_for_device(port->dev, | 583 | dma_sync_single_for_device(port->dev, |
| 584 | pdc->dma_addr, | 584 | pdc->dma_addr, |
| 585 | pdc->dma_size, | 585 | pdc->dma_size, |