diff mbox

[trivial] omap24xxcam-dma: Fix logical test

Message ID 1322422935.27199.3.camel@Joe-Laptop (mailing list archive)
State Accepted, archived
Headers

Commit Message

Joe Perches Nov. 27, 2011, 7:42 p.m. UTC 
  Likely misuse of & vs &&.

Signed-off-by: Joe Perches <joe@perches.com>
---
 drivers/media/video/omap24xxcam-dma.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)



--
To unsubscribe from this list: send the line "unsubscribe linux-media" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Comments

Sakari Ailus Nov. 28, 2011, 4:04 p.m. UTC | #1 
On Sun, Nov 27, 2011 at 11:42:15AM -0800, Joe Perches wrote:
> Likely misuse of & vs &&.
> 
> Signed-off-by: Joe Perches <joe@perches.com>

Thanks, Joe!

Acked-by: Sakari Ailus <sakari.ailus@iki.fi>

> ---
>  drivers/media/video/omap24xxcam-dma.c |    2 +-
>  1 files changed, 1 insertions(+), 1 deletions(-)
> 
> diff --git a/drivers/media/video/omap24xxcam-dma.c b/drivers/media/video/omap24xxcam-dma.c
> index 1d54b86..3ea38a8 100644
> --- a/drivers/media/video/omap24xxcam-dma.c
> +++ b/drivers/media/video/omap24xxcam-dma.c
> @@ -506,7 +506,7 @@ int omap24xxcam_sgdma_queue(struct omap24xxcam_sgdma *sgdma,
>  	unsigned long flags;
>  	struct sgdma_state *sg_state;
>  
> -	if ((sglen < 0) || ((sglen > 0) & !sglist))
> +	if ((sglen < 0) || ((sglen > 0) && !sglist))
>  		return -EINVAL;
>  
>  	spin_lock_irqsave(&sgdma->lock, flags);
> 
> 
> --
> To unsubscribe from this list: send the line "unsubscribe linux-media" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at  http://vger.kernel.org/majordomo-info.html
diff mbox

Patch

diff --git a/drivers/media/video/omap24xxcam-dma.c b/drivers/media/video/omap24xxcam-dma.c
index 1d54b86..3ea38a8 100644
--- a/drivers/media/video/omap24xxcam-dma.c
+++ b/drivers/media/video/omap24xxcam-dma.c
@@ -506,7 +506,7 @@  int omap24xxcam_sgdma_queue(struct omap24xxcam_sgdma *sgdma,
 	unsigned long flags;
 	struct sgdma_state *sg_state;
 
-	if ((sglen < 0) || ((sglen > 0) & !sglist))
+	if ((sglen < 0) || ((sglen > 0) && !sglist))
 		return -EINVAL;
 
 	spin_lock_irqsave(&sgdma->lock, flags);