diff options
| author | Joe Perches <joe@perches.com> | 2011-11-27 19:42:15 +0100 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2011-12-09 23:28:42 +0100 |
| commit | 9aa7705c966c750dda3d5c8d8a20f8e46668911c (patch) | |
| tree | 73b19bc2d46bfb3e16fcd5c703500a42141ae314 /drivers/media | |
| parent | [media] omap_vout: fix crash if no driver for a display (diff) | |
| download | linux-9aa7705c966c750dda3d5c8d8a20f8e46668911c.tar.xz linux-9aa7705c966c750dda3d5c8d8a20f8e46668911c.zip | |
[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>
Diffstat (limited to 'drivers/media')
| -rw-r--r-- | 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 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); |