From: Philipp Zabel <p.zabel@pengutronix.de>
Date: Fri, 9 May 2014 15:32:10 +0000 (-0300)
Subject: [media] vb2: fix num_buffers calculation if req->count > VIDEO_MAX_FRAMES
X-Git-Tag: omap-for-v3.16/fixes-against-rc1~25^2~119
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=4cf743de880e3e60f106b7fc713f235abad9ea7e;p=pandora-kernel.git

[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>
---

Reading git-diff-tree failed