From 6ca6b6d436dc30f0adf7cc76cfcf015ac75516f9 Mon Sep 17 00:00:00 2001 From: Juha Yrjola Date: Thu, 29 Jan 2009 08:57:12 -0800 Subject: [PATCH] --- yaml --- r: 130840 b: refs/heads/master c: 320ce6f6fb3d95e02a183709e51d8a16a8b00e0a h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/arch/arm/plat-omap/dma.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index f61bfb2f2d5b..f028dd7e8114 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 06151158f2da4764479b4ec01688dc4bade6ce9d +refs/heads/master: 320ce6f6fb3d95e02a183709e51d8a16a8b00e0a diff --git a/trunk/arch/arm/plat-omap/dma.c b/trunk/arch/arm/plat-omap/dma.c index e77373c39f8c..bec8e363d545 100644 --- a/trunk/arch/arm/plat-omap/dma.c +++ b/trunk/arch/arm/plat-omap/dma.c @@ -1888,11 +1888,11 @@ static int omap2_dma_handle_ch(int ch) status = dma_read(CSR(ch)); } + dma_write(status, CSR(ch)); + if (likely(dma_chan[ch].callback != NULL)) dma_chan[ch].callback(ch, status, dma_chan[ch].data); - dma_write(status, CSR(ch)); - return 0; }