diff options
author | Russell King <rmk@dyn-67.arm.linux.org.uk> | 2008-03-06 12:18:25 +0000 |
---|---|---|
committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2008-03-06 12:18:25 +0000 |
commit | 5853e7427858a9ae493ea4999ef1069d2e2550d9 (patch) | |
tree | 6084c4e69950f812e2849c6ec3877f867fdc5b53 /arch/arm/plat-omap/dma.c | |
parent | 6bb68f8867348257e757de9c30ada4e90fe695d9 (diff) | |
parent | 09f21ed4c1bd158a92114074c268e4a835690ca5 (diff) | |
download | linux-5853e7427858a9ae493ea4999ef1069d2e2550d9.tar.bz2 |
Merge branch 'omap-fixes'
* omap-fixes:
ARM: OMAP2: Register the L4 io bus to boot OMAP2
ARM: OMAP1: Compile in other 16xx boards to OSK defconfig
ARM: OMAP1: Refresh H2 defconfig
ARM: OMAP1: Refresh OSK defconfig
ARM: OMAP: gpio lockdep updates
ARM: OMAP1: omap1/pm.c build fix
ARM: OMAP1: omap h2 regression fix
ARM: OMAP1: Fix compile for boards depending on old gpio expander
ARM: OMAP1: omap h3 regression and build fix
ARM: OMAP: Remove compiler warning when i2c is not set
ARM: OMAP: fix omap i2c init (regression)
ARM: OMAP: fix false lockdep warnings
ARM: OMAP: Fix sleep under spinlock for cpufreq
ARM: OMAP: Pass logical DMA channel number always to callback handlers
Diffstat (limited to 'arch/arm/plat-omap/dma.c')
-rw-r--r-- | arch/arm/plat-omap/dma.c | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/arch/arm/plat-omap/dma.c b/arch/arm/plat-omap/dma.c index 9255a4598c71..91004a3c4794 100644 --- a/arch/arm/plat-omap/dma.c +++ b/arch/arm/plat-omap/dma.c @@ -1705,14 +1705,8 @@ static int omap2_dma_handle_ch(int ch) status = OMAP_DMA_CSR_REG(ch); } - if (likely(dma_chan[ch].callback != NULL)) { - if (dma_chan[ch].chain_id != -1) - dma_chan[ch].callback(dma_chan[ch].chain_id, status, - dma_chan[ch].data); - else - dma_chan[ch].callback(ch, status, dma_chan[ch].data); - - } + if (likely(dma_chan[ch].callback != NULL)) + dma_chan[ch].callback(ch, status, dma_chan[ch].data); OMAP_DMA_CSR_REG(ch) = status; |