* [PATCH] [media] vb2: fix num_buffers calculation if req->count > VIDEO_MAX_FRAMES
@ 2014-05-09 15:32 Philipp Zabel
2014-05-09 15:48 ` Hans Verkuil
0 siblings, 1 reply; 2+ messages in thread
From: Philipp Zabel @ 2014-05-09 15:32 UTC (permalink / raw)
To: Mauro Carvalho Chehab; +Cc: linux-media, kernel, Philipp Zabel
Signed-off-by: Philipp Zabel <p.zabel@pengutronix.de>
---
drivers/media/v4l2-core/videobuf2-core.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/media/v4l2-core/videobuf2-core.c b/drivers/media/v4l2-core/videobuf2-core.c
index 40024d7..4d4f6ba 100644
--- a/drivers/media/v4l2-core/videobuf2-core.c
+++ b/drivers/media/v4l2-core/videobuf2-core.c
@@ -905,7 +905,7 @@ static int __reqbufs(struct vb2_queue *q, struct v4l2_requestbuffers *req)
* Make sure the requested values and current defaults are sane.
*/
num_buffers = min_t(unsigned int, req->count, VIDEO_MAX_FRAME);
- num_buffers = max_t(unsigned int, req->count, q->min_buffers_needed);
+ num_buffers = max_t(unsigned int, num_buffers, q->min_buffers_needed);
memset(q->plane_sizes, 0, sizeof(q->plane_sizes));
memset(q->alloc_ctx, 0, sizeof(q->alloc_ctx));
q->memory = req->memory;
--
2.0.0.rc0
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [PATCH] [media] vb2: fix num_buffers calculation if req->count > VIDEO_MAX_FRAMES
2014-05-09 15:32 [PATCH] [media] vb2: fix num_buffers calculation if req->count > VIDEO_MAX_FRAMES Philipp Zabel
@ 2014-05-09 15:48 ` Hans Verkuil
0 siblings, 0 replies; 2+ messages in thread
From: Hans Verkuil @ 2014-05-09 15:48 UTC (permalink / raw)
To: Philipp Zabel, Mauro Carvalho Chehab; +Cc: linux-media, kernel
On 05/09/2014 05:32 PM, Philipp Zabel wrote:
> Signed-off-by: Philipp Zabel <p.zabel@pengutronix.de>
Reviewed-by: Hans Verkuil <hans.verkuil@cisco.com>
Regards,
Hans
> ---
> drivers/media/v4l2-core/videobuf2-core.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/drivers/media/v4l2-core/videobuf2-core.c b/drivers/media/v4l2-core/videobuf2-core.c
> index 40024d7..4d4f6ba 100644
> --- a/drivers/media/v4l2-core/videobuf2-core.c
> +++ b/drivers/media/v4l2-core/videobuf2-core.c
> @@ -905,7 +905,7 @@ static int __reqbufs(struct vb2_queue *q, struct v4l2_requestbuffers *req)
> * Make sure the requested values and current defaults are sane.
> */
> num_buffers = min_t(unsigned int, req->count, VIDEO_MAX_FRAME);
> - num_buffers = max_t(unsigned int, req->count, q->min_buffers_needed);
> + num_buffers = max_t(unsigned int, num_buffers, q->min_buffers_needed);
> memset(q->plane_sizes, 0, sizeof(q->plane_sizes));
> memset(q->alloc_ctx, 0, sizeof(q->alloc_ctx));
> q->memory = req->memory;
>
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2014-05-09 15:49 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2014-05-09 15:32 [PATCH] [media] vb2: fix num_buffers calculation if req->count > VIDEO_MAX_FRAMES Philipp Zabel
2014-05-09 15:48 ` Hans Verkuil
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox