---

yaml
---
r: 316641
b: refs/heads/master
c: 236b106
h: refs/heads/master
i:
  316639: ec47fe3
v: v3

[refs]

@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 11f932ec221ee07c3a9d49e83df7d44b13f8885f
+refs/heads/master: 236b106f1a66a272708e4960cde8cbcdd1611435

trunk/drivers/dma/dw_dmac.c

@@ -1437,6 +1437,9 @@ static int __init dw_probe(struct platform_device *pdev)
 	/* 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 @@ static int __init dw_probe(struct platform_device *pdev)
 
 	/* 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);