diff options
| author | Markus Pargmann <mpa@pengutronix.de> | 2013-10-29 11:47:48 +0400 |
|---|---|---|
| committer | Vinod Koul <vinod.koul@intel.com> | 2013-11-13 14:08:30 +0400 |
| commit | bb3660f130996d2653f123ee1ad802f11adbfb1c (patch) | |
| tree | 52f0c9e2312f1f376937732548c17de8781ff008 /drivers/dma/mxs-dma.c | |
| parent | 702e94d66b555622ca6830de3095b5f0bb2ff6d7 (diff) | |
| download | linux-bb3660f130996d2653f123ee1ad802f11adbfb1c.tar.xz | |
dma: mxs-dma: Update state after channel reset
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>
Diffstat (limited to 'drivers/dma/mxs-dma.c')
| -rw-r--r-- | drivers/dma/mxs-dma.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/dma/mxs-dma.c b/drivers/dma/mxs-dma.c index 530267068061..f48f87feeca4 100644 --- a/drivers/dma/mxs-dma.c +++ b/drivers/dma/mxs-dma.c @@ -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 |