public inbox for linux-kernel@vger.kernel.org
 help / color / mirror / Atom feed
* [PATCH] OMAP: dma_chan[lch_head].flag & OMAP_DMA_ACTIVE tested twice in omap_dma_unlink_lch()
@ 2010-01-09 13:55 Roel Kluin
  2010-01-11 23:14 ` Tony Lindgren
  0 siblings, 1 reply; 2+ messages in thread
From: Roel Kluin @ 2010-01-09 13:55 UTC (permalink / raw)
  To: Tony Lindgren, linux-omap@vger.kernel.org, Andrew Morton, LKML

The same flag and bits were tested twice.

Signed-off-by: Roel Kluin <roel.kluin@gmail.com>
---
 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();

^ permalink raw reply related	[flat|nested] 2+ messages in thread

* Re: [PATCH] OMAP: dma_chan[lch_head].flag & OMAP_DMA_ACTIVE tested twice in omap_dma_unlink_lch()
  2010-01-09 13:55 [PATCH] OMAP: dma_chan[lch_head].flag & OMAP_DMA_ACTIVE tested twice in omap_dma_unlink_lch() Roel Kluin
@ 2010-01-11 23:14 ` Tony Lindgren
  0 siblings, 0 replies; 2+ messages in thread
From: Tony Lindgren @ 2010-01-11 23:14 UTC (permalink / raw)
  To: Roel Kluin; +Cc: linux-omap@vger.kernel.org, Andrew Morton, LKML

* Roel Kluin <roel.kluin@gmail.com> [100109 05:49]:
> The same flag and bits were tested twice.
> 
> Signed-off-by: Roel Kluin <roel.kluin@gmail.com>
> ---
>  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();

^ permalink raw reply	[flat|nested] 2+ messages in thread

end of thread, other threads:[~2010-01-11 23:14 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2010-01-09 13:55 [PATCH] OMAP: dma_chan[lch_head].flag & OMAP_DMA_ACTIVE tested twice in omap_dma_unlink_lch() Roel Kluin
2010-01-11 23:14 ` Tony Lindgren

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox