diff options
| author | Juha Yrjola <juha.yrjola@solidboot.com> | 2009-01-29 17:57:12 +0100 |
|---|---|---|
| committer | Tony Lindgren <tony@atomide.com> | 2009-01-29 17:57:12 +0100 |
| commit | 320ce6f6fb3d95e02a183709e51d8a16a8b00e0a (patch) | |
| tree | c38b7f28be57747791e2c91a11ad87c8b2428550 /arch/arm/plat-omap | |
| parent | ARM: OMAP: Fix McBSP spin_lock deadlock (diff) | |
| download | linux-320ce6f6fb3d95e02a183709e51d8a16a8b00e0a.tar.xz linux-320ce6f6fb3d95e02a183709e51d8a16a8b00e0a.zip | |
ARM: OMAP: Fix race in OMAP2/3 DMA IRQ handling
CSR must be cleared before invoking the callback.
If the callback function starts a new, fast DMA transfer on the same
channel, the completion status might lost if CSR is cleared after
the callback invocation.
Signed-off-by: Juha Yrjola <juha.yrjola@solidboot.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>
Diffstat (limited to 'arch/arm/plat-omap')
| -rw-r--r-- | arch/arm/plat-omap/dma.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/plat-omap/dma.c b/arch/arm/plat-omap/dma.c index e77373c39f8c..bec8e363d545 100644 --- a/arch/arm/plat-omap/dma.c +++ b/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; } |