diff options
| author | Ingo Molnar <mingo@elte.hu> | 2009-01-21 04:39:51 -0500 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-01-21 04:39:51 -0500 |
| commit | 198030782cedf25391e67e7c88b04f87a5eb6563 (patch) | |
| tree | 5b7368c6bf052bcb4bb273497a57900720d36f51 /drivers/serial/atmel_serial.c | |
| parent | 4ec71fa2d2c3f1040348f2604f4b8ccc833d1c2e (diff) | |
| parent | 92181f190b649f7ef2b79cbf5c00f26ccc66da2a (diff) | |
Merge branch 'x86/mm' into core/percpu
Conflicts:
arch/x86/mm/fault.c
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, |