Merge branch 'dma_complete' into next

2013-10-30 15:42:19 +05:30
parent b967aecf17 7db5f7274a
commit f0dad6e701
30 changed files with 59 additions and 59 deletions
@@ -640,7 +640,7 @@ static enum dma_status edma_tx_status(struct dma_chan *chan,
 	unsigned long flags;

 	ret = dma_cookie_status(chan, cookie, txstate);
-	if (ret == DMA_SUCCESS || !txstate)
+	if (ret == DMA_COMPLETE || !txstate)
 		return ret;

 	spin_lock_irqsave(&echan->vchan.lock, flags);