2010-01-09 13:51:13

by Roel Kluin

Subject: [PATCH] OMAP: dma_chan[lch_head].flag & OMAP_DMA_ACTIVE tested twice in omap_dma_unlink_lch()

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.

diff --git a/arch/arm/plat-omap/dma.c b/arch/arm/plat-omap/dma.c
index 09d82b3..728c642 100644
--- a/arch/arm/plat-omap/dma.c
+++ b/arch/arm/plat-omap/dma.c
@@ -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();

2010-01-11 23:14:12

by Tony Lindgren

Subject: Re: [PATCH] OMAP: dma_chan[lch_head].flag & OMAP_DMA_ACTIVE tested twice in omap_dma_unlink_lch()

* Roel Kluin <[email protected]> [100109 05:49]:
> 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

> diff --git a/arch/arm/plat-omap/dma.c b/arch/arm/plat-omap/dma.c
> index 09d82b3..728c642 100644
> --- a/arch/arm/plat-omap/dma.c
> +++ b/arch/arm/plat-omap/dma.c
> @@ -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();