diff options
| author | Andreas Bombe <aeb@debian.org> | 2010-03-21 16:02:45 -0300 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2010-05-19 12:57:13 -0300 |
| commit | dab7e3106ddd6cbc3b55301228407b9d17ce7773 (patch) | |
| tree | 1b6caa87522844e7ea8cc01932365201271f1afd /drivers/media/video/cx23885/cx23885-video.c | |
| parent | 0a062033f727dc041691bfd768f4cf0598f559a1 (diff) | |
| download | kernel_samsung_crespo-dab7e3106ddd6cbc3b55301228407b9d17ce7773.zip kernel_samsung_crespo-dab7e3106ddd6cbc3b55301228407b9d17ce7773.tar.gz kernel_samsung_crespo-dab7e3106ddd6cbc3b55301228407b9d17ce7773.tar.bz2 | |
V4L/DVB: V4L2: Replace loops for finding max buffers in VIDIOC_REQBUFS callbacks
Due to obvious copy and paste coding a number of video capture drivers
which implement a limit on the buffer memory decremented the user
supplied buffer count in a while loop until it reaches an acceptable
value.
This is a silly thing to do when the maximum value can be directly
computed.
Signed-off-by: Andreas Bombe <aeb@debian.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'drivers/media/video/cx23885/cx23885-video.c')
| -rw-r--r-- | drivers/media/video/cx23885/cx23885-video.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/media/video/cx23885/cx23885-video.c b/drivers/media/video/cx23885/cx23885-video.c index 2d3ac8b..543b854 100644 --- a/drivers/media/video/cx23885/cx23885-video.c +++ b/drivers/media/video/cx23885/cx23885-video.c @@ -514,8 +514,8 @@ static int buffer_setup(struct videobuf_queue *q, unsigned int *count, *size = fh->fmt->depth*fh->width*fh->height >> 3; if (0 == *count) *count = 32; - while (*size * *count > vid_limit * 1024 * 1024) - (*count)--; + if (*size * *count > vid_limit * 1024 * 1024) + *count = (vid_limit * 1024 * 1024) / *size; return 0; } |