aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTrent Piepho <xyzzy@speakeasy.org>2009-03-28 21:25:35 -0400
committerMauro Carvalho Chehab <mchehab@redhat.com>2009-03-30 11:43:44 -0400
commit601bc2984508e8b70a604167229f4f687eae63bb (patch)
tree52e2a48b67741fb0309fdc005dbc33f54c5fc76c
parentf911eab66d892b7cf9c3e59de7716b89827a42c1 (diff)
V4L/DVB (11262): bttv: Remove buffer type check from vidioc_g_parm
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. The driver was only allowing VIDEO_CAPTURE buffers for g_parm, but since the driver defines ->vidioc_try_fmt_vid_overlay() and ->vidioc_try_fmt_vbi_cap() it will now allow VIDEO_OVERLAY and VBI_CAPTURE buffers as well. This should be fine as the driver only fills in the frame rate field, which is just as valid for video overlay and vbi capture as it is for video capture. Signed-off-by: Trent Piepho <xyzzy@speakeasy.org> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
-rw-r--r--drivers/media/video/bt8xx/bttv-driver.c2
1 files changed, 0 insertions, 2 deletions
diff --git a/drivers/media/video/bt8xx/bttv-driver.c b/drivers/media/video/bt8xx/bttv-driver.c
index 3079d925e4cf..1dc79b82cf42 100644
--- a/drivers/media/video/bt8xx/bttv-driver.c
+++ b/drivers/media/video/bt8xx/bttv-driver.c
@@ -2928,8 +2928,6 @@ static int bttv_g_parm(struct file *file, void *f,
2928 struct bttv_fh *fh = f; 2928 struct bttv_fh *fh = f;
2929 struct bttv *btv = fh->btv; 2929 struct bttv *btv = fh->btv;
2930 2930
2931 if (parm->type != V4L2_BUF_TYPE_VIDEO_CAPTURE)
2932 return -EINVAL;
2933 v4l2_video_std_frame_period(bttv_tvnorms[btv->tvnorm].v4l2_id, 2931 v4l2_video_std_frame_period(bttv_tvnorms[btv->tvnorm].v4l2_id,
2934 &parm->parm.capture.timeperframe); 2932 &parm->parm.capture.timeperframe);
2935 return 0; 2933 return 0;