commit 236b106f1a66a272708e4960cde8cbcdd1611435
author Andy Shevchenko <andriy.shevchenko@linux.intel.com> Tue Jun 19 13:34:07 2012 +0300
committer Vinod Koul <vinod.koul@linux.intel.com> Thu Jun 21 08:05:37 2012 +0530
tree 7bcefe24f248fbdf4ac0dd5fe9da587aa5c1ad2c
parent 11f932ec221ee07c3a9d49e83df7d44b13f8885f

dw_dmac: disable BLOCK interrupts

Just to be sure we are in known state we disable the BLOCK interupts.

Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Acked-by: Viresh Kumar <viresh.linux@gmail.com>
Signed-off-by: Vinod Koul <vinod.koul@linux.intel.com>

drivers/dma/dw_dmac.c

diff --git a/drivers/dma/dw_dmac.c b/drivers/dma/dw_dmac.c
index 8a37f6d..d3038a0 100644
--- a/drivers/dma/dw_dmac.c
+++ b/drivers/dma/dw_dmac.c
@@ -1437,6 +1437,9 @@
 	/* force dma off, just in case */
 	dw_dma_off(dw);
 
+	/* disable BLOCK interrupts as well */
+	channel_clear_bit(dw, MASK.BLOCK, dw->all_chan_mask);
+
 	err = request_irq(irq, dw_dma_interrupt, 0, "dw_dmac", dw);
 	if (err)
 		goto err_irq;
@@ -1476,6 +1479,7 @@
 
 	/* Clear all interrupts on all channels. */
 	dma_writel(dw, CLEAR.XFER, dw->all_chan_mask);
+	dma_writel(dw, CLEAR.BLOCK, dw->all_chan_mask);
 	dma_writel(dw, CLEAR.SRC_TRAN, dw->all_chan_mask);
 	dma_writel(dw, CLEAR.DST_TRAN, dw->all_chan_mask);
 	dma_writel(dw, CLEAR.ERROR, dw->all_chan_mask);