From b47792f31492255900e1f49b7c17ad6a3cd518b1 Mon Sep 17 00:00:00 2001 From: Brian Niebuhr Date: Tue, 9 Mar 2010 16:48:03 -0600 Subject: [PATCH] --- yaml --- r: 189627 b: refs/heads/master c: bb17ef102b72e38557bfa829511e06c4bd3bb972 h: refs/heads/master i: 189625: ccb2c9a5bd54c73569b1e535b5b8f2567e1f9bc2 189623: 5c4beb21e502bbc30b58c4613efd5ddd6a490cc2 v: v3 --- [refs] | 2 +- trunk/arch/arm/mach-davinci/dma.c | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index b66868f7d4ad..36989a2fb4d6 100644 --- 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 index 15dd886df04c..260485cc76df 100644 --- 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);