From: Trent Piepho Date: Sun, 29 Mar 2009 01:25:35 +0000 (-0300) Subject: V4L/DVB (11261): saa7146: Remove buffer type check from vidioc_g_parm X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=f911eab66d892b7cf9c3e59de7716b89827a42c1;p=linux-2.6-omap-h63xx.git V4L/DVB (11261): saa7146: Remove buffer type check from vidioc_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 with vidioc_(g|s)_parm. The driver was only allowing VIDEO_CAPTURE buffers for g_parm, but since the driver defines ->vidioc_try_fmt_vid_overlay() it will now allow VIDEO_OVERLAY buffers as well. This should be fine as the fields the driver fills in, readbuffers and frame rate, aren't wrong for VIDEO_OVERLAY buffers. Signed-off-by: Trent Piepho Signed-off-by: Mauro Carvalho Chehab --- diff --git a/drivers/media/common/saa7146_video.c b/drivers/media/common/saa7146_video.c index 80352853bb5..552dab442d7 100644 --- a/drivers/media/common/saa7146_video.c +++ b/drivers/media/common/saa7146_video.c @@ -723,8 +723,6 @@ static int vidioc_g_parm(struct file *file, void *fh, struct saa7146_dev *dev = ((struct saa7146_fh *)fh)->dev; struct saa7146_vv *vv = dev->vv_data; - if (parm->type != V4L2_BUF_TYPE_VIDEO_CAPTURE) - return -EINVAL; parm->parm.capture.readbuffers = 1; v4l2_video_std_frame_period(vv->standard->id, &parm->parm.capture.timeperframe);