From: Joe Perches <joe@perches.com>
Date: Sun, 27 Nov 2011 18:42:15 +0000 (-0300)
Subject: [media] [trivial] omap24xxcam-dma: Fix logical test
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=9aa7705c966c750dda3d5c8d8a20f8e46668911c;p=linux-beck.git

[media] [trivial] omap24xxcam-dma: Fix logical test

Likely misuse of & vs &&.

Signed-off-by: Joe Perches <joe@perches.com>
Acked-by: Sakari Ailus <sakari.ailus@iki.fi>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
---

diff --git a/drivers/media/video/omap24xxcam-dma.c b/drivers/media/video/omap24xxcam-dma.c
index 1d54b86c936b..3ea38a8def8e 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);