diff options
| author | Vinod Koul | 2013-10-30 11:12:19 +0100 |
|---|---|---|
| committer | Vinod Koul | 2013-10-30 11:12:19 +0100 |
| commit | f0dad6e701cb66301287074c39183c7312139530 (patch) | |
| tree | b4a38d8dcc49206fcedae7192e898df1011a6810 /drivers/tty | |
| parent | Merge branch 'for-linus' into next (diff) | |
| parent | dmaengine: remove unused DMA_SUCCESS (diff) | |
| download | kernel-qcow2-linux-f0dad6e701cb66301287074c39183c7312139530.tar.gz kernel-qcow2-linux-f0dad6e701cb66301287074c39183c7312139530.tar.xz kernel-qcow2-linux-f0dad6e701cb66301287074c39183c7312139530.zip | |
Merge branch 'dma_complete' into next
Diffstat (limited to 'drivers/tty')
| -rw-r--r-- | drivers/tty/serial/sh-sci.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/tty/serial/sh-sci.c b/drivers/tty/serial/sh-sci.c index 537750261aaa..7d8103cd3e2e 100644 --- a/drivers/tty/serial/sh-sci.c +++ b/drivers/tty/serial/sh-sci.c @@ -1433,7 +1433,7 @@ static void work_fn_rx(struct work_struct *work) desc = s->desc_rx[new]; if (dma_async_is_tx_complete(s->chan_rx, s->active_rx, NULL, NULL) != - DMA_SUCCESS) { + DMA_COMPLETE) { /* Handle incomplete DMA receive */ struct dma_chan *chan = s->chan_rx; struct shdma_desc *sh_desc = container_of(desc, |