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/dtor/input
[pandora-kernel.git]
/
drivers
/
media
/
video
/
omap24xxcam.c
diff --git
a/drivers/media/video/omap24xxcam.c
b/drivers/media/video/omap24xxcam.c
index
ce76d95
..
f85b2ed
100644
(file)
--- a/
drivers/media/video/omap24xxcam.c
+++ b/
drivers/media/video/omap24xxcam.c
@@
-452,8
+452,8
@@
static int omap24xxcam_vbq_setup(struct videobuf_queue *vbq, unsigned int *cnt,
*size = fh->pix.sizeimage;
/* accessing fh->cam->capture_mem is ok, it's constant */
-
while
(*size * *cnt > fh->cam->capture_mem)
-
(*cnt)--
;
+
if
(*size * *cnt > fh->cam->capture_mem)
+
*cnt = fh->cam->capture_mem / *size
;
return 0;
}