]> pilppa.com Git - linux-2.6-omap-h63xx.git/commitdiff
V4L/DVB (11261): saa7146: Remove buffer type check from vidioc_g_parm
authorTrent Piepho <xyzzy@speakeasy.org>
Sun, 29 Mar 2009 01:25:35 +0000 (22:25 -0300)
committerMauro Carvalho Chehab <mchehab@redhat.com>
Mon, 30 Mar 2009 15:43:44 +0000 (12:43 -0300)
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 <xyzzy@speakeasy.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
drivers/media/common/saa7146_video.c

index 80352853bb5d0a09e7b21a7e28453962b6aa357a..552dab442d78dbe524a8ff354d60bbc4ff42ddec 100644 (file)
@@ -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);