Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 2509e1cb authored by Trent Piepho's avatar Trent Piepho Committed by Mauro Carvalho Chehab
Browse files

V4L/DVB (11265): stkwebcam: Remove buffer type check from g_parm and q/dq/reqbufs 



The v4l2-ioctl core only allows buffer types for which the corresponding
->vidioc_try_fmt_xxx() methods are defined to be used with
vidioc_(q|dq|query)bufs(), vidioc_reqbufs() and now vidioc_(s|g)_parm.

This driver only defines ->vidioc_try_fmt_vid_cap() so only VIDEO_CAPTURE
buffers are allowed to be used with vidioc_g_parm(), vidioc_qbuf(),
vidioc_dqbuf(), and vidioc_reqbufs().

Cc: Jaime Velasco Juan <jsagarribay@gmail.com>
Signed-off-by: default avatarTrent Piepho <xyzzy@speakeasy.org>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@redhat.com>
parent 020b882b

drivers/media/video/stk-webcam.c

+1 −9
Original line number Diff line number Diff line
@@ -1112,8 +1112,6 @@ static int stk_vidioc_reqbufs(struct file *filp, 


	if (dev == NULL)

		return -ENODEV;

	if (rb->type != V4L2_BUF_TYPE_VIDEO_CAPTURE)

		return -EINVAL;

	if (rb->memory != V4L2_MEMORY_MMAP)

		return -EINVAL;

	if (is_streaming(dev)
@@ -1152,8 +1150,6 @@ static int stk_vidioc_qbuf(struct file *filp, 
	struct stk_camera *dev = priv;

	struct stk_sio_buffer *sbuf;

	unsigned long flags;

	if (buf->type != V4L2_BUF_TYPE_VIDEO_CAPTURE)

		return -EINVAL;



	if (buf->memory != V4L2_MEMORY_MMAP)

		return -EINVAL;
@@ -1180,8 +1176,7 @@ static int stk_vidioc_dqbuf(struct file *filp, 
	unsigned long flags;

	int ret;



	if (buf->type != V4L2_BUF_TYPE_VIDEO_CAPTURE

		|| !is_streaming(dev))

	if (!is_streaming(dev))

		return -EINVAL;



	if (filp->f_flags & O_NONBLOCK && list_empty(&dev->sio_full))
@@ -1240,9 +1235,6 @@ static int stk_vidioc_streamoff(struct file *filp, 
static int stk_vidioc_g_parm(struct file *filp,

		void *priv, struct v4l2_streamparm *sp)

{

	if (sp->type != V4L2_BUF_TYPE_VIDEO_CAPTURE)

		return -EINVAL;



	/*FIXME This is not correct */

	sp->parm.capture.timeperframe.numerator = 1;

	sp->parm.capture.timeperframe.denominator = 30;