diff options
| author | Vinod Koul <vinod.koul@intel.com> | 2013-10-30 14:12:19 +0400 |
|---|---|---|
| committer | Vinod Koul <vinod.koul@intel.com> | 2013-10-30 14:12:19 +0400 |
| commit | f0dad6e701cb66301287074c39183c7312139530 (patch) | |
| tree | b4a38d8dcc49206fcedae7192e898df1011a6810 /drivers/dma/sh | |
| parent | b967aecf1714c10d1e6c045e43b6385884f1ca77 (diff) | |
| parent | 7db5f7274a0b065abdc358be2a44b4a911d75707 (diff) | |
| download | linux-f0dad6e701cb66301287074c39183c7312139530.tar.xz | |
Merge branch 'dma_complete' into next
Diffstat (limited to 'drivers/dma/sh')
| -rw-r--r-- | drivers/dma/sh/shdma-base.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/dma/sh/shdma-base.c b/drivers/dma/sh/shdma-base.c index d94ab592cc1b..2e7b394def80 100644 --- a/drivers/dma/sh/shdma-base.c +++ b/drivers/dma/sh/shdma-base.c @@ -724,7 +724,7 @@ static enum dma_status shdma_tx_status(struct dma_chan *chan, * If we don't find cookie on the queue, it has been aborted and we have * to report error */ - if (status != DMA_SUCCESS) { + if (status != DMA_COMPLETE) { struct shdma_desc *sdesc; status = DMA_ERROR; list_for_each_entry(sdesc, &schan->ld_queue, node) |