git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound
[pandora-kernel.git]
/
drivers
/
media
/
video
/
omap24xxcam-dma.c
diff --git
a/drivers/media/video/omap24xxcam-dma.c
b/drivers/media/video/omap24xxcam-dma.c
index
1d54b86
..
3ea38a8
100644
(file)
--- 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);