---

yaml --- r: 189627 b: refs/heads/master c: bb17ef1 h: refs/heads/master i: 189625: ccb2c9a 189623: 5c4beb2 v: v3
git-mirror · Apr 5, 2010 · b47792f · b47792f
1 parent 72d2b39
commit b47792f
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 5eb2e891f038c8e04757f4536b9693faf35978a3
+refs/heads/master: bb17ef102b72e38557bfa829511e06c4bd3bb972
diff --git a/trunk/arch/arm/mach-davinci/dma.c b/trunk/arch/arm/mach-davinci/dma.c
@@ -1266,7 +1266,8 @@ int edma_start(unsigned channel)
 		/* EDMA channel with event association */
 		pr_debug("EDMA: ER%d %08x\n", j,
 			edma_shadow0_read_array(ctlr, SH_ER, j));
-		/* Clear any pending error */
+		/* Clear any pending event or error */
+		edma_write_array(ctlr, EDMA_ECR, j, mask);
 		edma_write_array(ctlr, EDMA_EMCR, j, mask);
 		/* Clear any SER */
 		edma_shadow0_write_array(ctlr, SH_SECR, j, mask);