OMAP: dma_chan[lch_head].flag & OMAP_DMA_ACTIVE tested twice in omap_dma_unlink_lch()
Subsystems (2)
PATCH 1/1 OMAP: dma_chan[lch_head].flag & OMAP_DMA_ACTIVE tested twice in omap_dma_unlink_lch()
The same flag and bits were tested twice.
--- arch/arm/plat-omap/dma.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-)
Is this what was intended? please review.
arch/arm/plat-omap/dma.c +1 -1
@@ -1183,7 +1183,7 @@ void omap_dma_unlink_lch(int lch_head, int lch_queue) }if ((dma_chan[lch_head].flags &OMAP_DMA_ACTIVE ) || - (dma_chan[lch_head].flags &OMAP_DMA_ACTIVE )) { + (dma_chan[lch_queue].flags &OMAP_DMA_ACTIVE )) {printk (KERN_ERR "omap_dma: You need to stop the DMA channels " "before unlinking\n" );dump_stack ();
Quoted 8 lines · Roel Kluin
The same flag and bits were tested twice.
Signed-off-by Roel Kluin <[email protected]>--- arch/arm/plat-omap/dma.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-)Is this what was intended? please review.
Thanks, nice catch. Will queue into omap-fixes.
Regards,
Tony
Quoted 13 lines
arch/arm/plat-omap/dma.c +1
-1@@ -1183,7 +1183,7 @@ void omap_dma_unlink_lch(int lch_head, int lch_queue) }if ((dma_chan[lch_head].flags &OMAP_DMA_ACTIVE ) || - (dma_chan[lch_head].flags &OMAP_DMA_ACTIVE )) { + (dma_chan[lch_queue].flags &OMAP_DMA_ACTIVE )) {printk (KERN_ERR "omap_dma: You need to stop the DMA channels " "before unlinking\n" );dump_stack ();
PATCH 1/1 OMAP: dma_chan[lch_head].flag & OMAP_DMA_ACTIVE tested twice
In reply to Roel KluinThis patch has been applied to the linux-omap
by youw fwiendly patch wobot.
Branch in linux-omap: omap-fixes
Initial commit ID (Likely to change): bf9e6367f80b285100f5fecd59ec11b643d4dcf1
PatchWorks
http://patchwork.kernel.org/patch/71928/
Git (Likely to change, and takes a while to get mirrored)
http://git.kernel.org/?p=linux/kernel/git/tmlind/linux-omap-2.6.git;a=commit;h=bf9e6367f80b285100f5fecd59ec11b643d4dcf1