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

Commit 020b882b authored by Trent Piepho's avatar Trent Piepho Committed by Mauro Carvalho Chehab
Browse files

V4L/DVB (11264): omap24xxcam: Remove buffer type check from vidioc_s/g_parm 



The v4l2-ioctl core now only allows buffer types for which the corresponding
->vidioc_try_fmt_xxx() methods are defined to be used in vidioc_(g|s)_parm.

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

Cc: Sakari Ailus <sakari.ailus@nokia.com>
Signed-off-by: default avatarTrent Piepho <xyzzy@speakeasy.org>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@redhat.com>
parent 5a275786

drivers/media/video/omap24xxcam.c

+0 −6
Original line number Diff line number Diff line
@@ -1285,9 +1285,6 @@ static int vidioc_g_parm(struct file *file, void *fh, 
	struct omap24xxcam_device *cam = ofh->cam;

	int rval;



	if (a->type != V4L2_BUF_TYPE_VIDEO_CAPTURE)

		return -EINVAL;



	mutex_lock(&cam->mutex);

	rval = vidioc_int_g_parm(cam->sdev, a);

	mutex_unlock(&cam->mutex);
@@ -1303,9 +1300,6 @@ static int vidioc_s_parm(struct file *file, void *fh, 
	struct v4l2_streamparm old_streamparm;

	int rval;



	if (a->type != V4L2_BUF_TYPE_VIDEO_CAPTURE)

		return -EINVAL;



	mutex_lock(&cam->mutex);

	if (cam->streaming) {

		rval = -EBUSY;