Merge remote-tracking branch 'net-next/master'

[karo-tx-linux.git] / drivers / dma / mxs-dma.c

diff --git a/drivers/dma/mxs-dma.c b/drivers/dma/mxs-dma.c
index ccd13df841db790ff9eabc9cbc9df79f5f8bb9af..7ab7cecc48a4abb14a21f59834f577b1f95e913a 100644 (file)
--- a/drivers/dma/mxs-dma.c
+++ b/drivers/dma/mxs-dma.c
@@ -224,7 +224,7 @@ static void mxs_dma_enable_chan(struct mxs_dma_chan *mxs_chan)
 
 static void mxs_dma_disable_chan(struct mxs_dma_chan *mxs_chan)
 {
-       mxs_chan->status = DMA_SUCCESS;
+       mxs_chan->status = DMA_COMPLETE;
 }
 
 static void mxs_dma_pause_chan(struct mxs_dma_chan *mxs_chan)
@@ -312,12 +312,12 @@ static irqreturn_t mxs_dma_int_handler(int irq, void *dev_id)
                        if (mxs_chan->flags & MXS_DMA_SG_LOOP)
                                mxs_chan->status = DMA_IN_PROGRESS;
                        else
-                               mxs_chan->status = DMA_SUCCESS;
+                               mxs_chan->status = DMA_COMPLETE;
                }
 
                stat1 &= ~(1 << channel);
 
-               if (mxs_chan->status == DMA_SUCCESS)
+               if (mxs_chan->status == DMA_COMPLETE)
                        dma_cookie_complete(&mxs_chan->desc);
 
                /* schedule tasklet on this channel */