Commit d06db7ec authored Sep 28, 2011 by Archit Taneja Committed by Mauro Carvalho Chehab Nov 07, 2011

[media] OMAP_VOUT: Fix check in reqbuf for buf_size allocation



The commit 383e4f69 makes reqbuf prevent
requesting a larger size buffer than what is allocated at kernel boot during
omap_vout_probe.

In omap_vout_buffer_setup callback API, the requested size is compared with
vout->buffer_size, this isn't correct as vout->buffer_size is later set to the
size requested in reqbuf. When the video device is opened the next time, this
check will prevent us to allocate a buffer which is larger than what we requested
the last time.

Don't use vout->buffer_size, always check with the parameters video1_bufsize
or video2_bufsize.

Signed-off-by: Archit Taneja <archit@ti.com>
Acked-by: Vaibhav Hiremath <hvaibhav@ti.com>
Signed-off-by: Vaibhav Hiremath <hvaibhav@ti.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>

parent 3f877045

drivers/media/video/omap/omap_vout.c

+5 −1

Original line number	Diff line number	Diff line
		@@ -663,10 +663,14 @@ static int omap_vout_buffer_setup(struct videobuf_queue q, unsigned int count,
		u32 phy_addr = 0, virt_addr = 0;
		struct omap_vout_device *vout = q->priv_data;
		struct omapvideo_info *ovid = &vout->vid_info;
		int vid_max_buf_size;

		if (!vout)
		return -EINVAL;

		vid_max_buf_size = vout->vid == OMAP_VIDEO1 ? video1_bufsize :
		video2_bufsize;

		if (V4L2_BUF_TYPE_VIDEO_OUTPUT != q->type)
		return -EINVAL;

		@@ -689,7 +693,7 @@ static int omap_vout_buffer_setup(struct videobuf_queue q, unsigned int count,
		video1_numbuffers : video2_numbuffers;

		/* Check the size of the buffer */
		if (*size > vout->buffer_size) {
		if (*size > vid_max_buf_size) {
		v4l2_err(&vout->vid_dev->v4l2_dev,
		"buffer allocation mismatch [%u] [%u]\n",
		*size, vout->buffer_size);