]> git.kernelconcepts.de Git - karo-tx-linux.git/commit
[media] vb2: fix num_buffers calculation if req->count > VIDEO_MAX_FRAMES
authorPhilipp Zabel <p.zabel@pengutronix.de>
Fri, 9 May 2014 15:32:10 +0000 (12:32 -0300)
committerMauro Carvalho Chehab <m.chehab@samsung.com>
Fri, 23 May 2014 16:59:02 +0000 (13:59 -0300)
commit4cf743de880e3e60f106b7fc713f235abad9ea7e
tree3db9500bd2a3cbd85ffa8f33c7d7aa16e2a9f51a
parentb646f0b7290c2cb68450c61256eb475e44437026
[media] vb2: fix num_buffers calculation if req->count > VIDEO_MAX_FRAMES

num_buffers can't be bigger than VIDEO_MAX_FRAME. This is assured by:
  num_buffers = min_t(unsigned int, req->count, VIDEO_MAX_FRAME);

However, this value is overriden by:
  num_buffers = max_t(unsigned int, req->count, q->min_buffers_needed);

It should, instead, use the previously calculated value as an input
to max_t:
  num_buffers = max_t(unsigned int, num_buffers, q->min_buffers_needed);

Signed-off-by: Philipp Zabel <p.zabel@pengutronix.de>
Reviewed-by: Hans Verkuil <hans.verkuil@cisco.com>
Signed-off-by: Hans Verkuil <hans.verkuil@cisco.com>
Signed-off-by: Mauro Carvalho Chehab <m.chehab@samsung.com>
drivers/media/v4l2-core/videobuf2-core.c