]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
dma: mxs-dma: Update state after channel reset
authorMarkus Pargmann <mpa@pengutronix.de>
Tue, 29 Oct 2013 07:47:48 +0000 (08:47 +0100)
committerVinod Koul <vinod.koul@intel.com>
Wed, 13 Nov 2013 10:08:30 +0000 (15:38 +0530)
After a channel reset, the channel stops running automatically. The
state update was missing so that a channel perperation right after a
channel reset failed.

Signed-off-by: Markus Pargmann <mpa@pengutronix.de>
Signed-off-by: Vinod Koul <vinod.koul@intel.com>
drivers/dma/mxs-dma.c

index 530267068061005dbd762bb97bdca44bfae11f9b..f48f87feeca4021fa97a95a7d9fa02127bce3599 100644 (file)
@@ -235,6 +235,8 @@ static void mxs_dma_reset_chan(struct mxs_dma_chan *mxs_chan)
                writel(1 << (chan_id + BP_APBHX_CHANNEL_CTRL_RESET_CHANNEL),
                        mxs_dma->base + HW_APBHX_CHANNEL_CTRL + STMP_OFFSET_REG_SET);
        }
+
+       mxs_chan->status = DMA_COMPLETE;
 }
 
 static void mxs_dma_enable_chan(struct mxs_dma_chan *mxs_chan)
@@ -362,7 +364,7 @@ static irqreturn_t mxs_dma_int_handler(int irq, void *dev_id)
                        chan);
                mxs_chan->status = DMA_ERROR;
                mxs_dma_reset_chan(mxs_chan);
-       } else {
+       } else if (mxs_chan->status != DMA_COMPLETE) {
                if (mxs_chan->flags & MXS_DMA_SG_LOOP)
                        mxs_chan->status = DMA_IN_PROGRESS;
                else