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
/
zr364xx.c
diff --git
a/drivers/media/video/zr364xx.c
b/drivers/media/video/zr364xx.c
index
3d4bac2
..
a82b5bd
100644
(file)
--- a/
drivers/media/video/zr364xx.c
+++ b/
drivers/media/video/zr364xx.c
@@
-376,8
+376,8
@@
static int buffer_setup(struct videobuf_queue *vq, unsigned int *count,
if (*count == 0)
*count = ZR364XX_DEF_BUFS;
-
while (*size * (*count)
> ZR364XX_DEF_BUFS * 1024 * 1024)
-
(*count)--
;
+
if (*size * *count
> ZR364XX_DEF_BUFS * 1024 * 1024)
+
*count = (ZR364XX_DEF_BUFS * 1024 * 1024) / *size
;
return 0;
}