aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/media/common
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
commitf911eab66d892b7cf9c3e59de7716b89827a42c1 (patch)
treef29ca311e04cd783c068311c4023513a289738c5 /drivers/media/common
parent34796bc009565ea72643087b7d69c9fa748bce9b (diff)
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 <xyzzy@speakeasy.org> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'drivers/media/common')
-rw-r--r--drivers/media/common/saa7146_video.c2
1 files changed, 0 insertions, 2 deletions
diff --git a/drivers/media/common/saa7146_video.c b/drivers/media/common/saa7146_video.c
index 80352853bb5d..552dab442d78 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,
723 struct saa7146_dev *dev = ((struct saa7146_fh *)fh)->dev; 723 struct saa7146_dev *dev = ((struct saa7146_fh *)fh)->dev;
724 struct saa7146_vv *vv = dev->vv_data; 724 struct saa7146_vv *vv = dev->vv_data;
725 725
726 if (parm->type != V4L2_BUF_TYPE_VIDEO_CAPTURE)
727 return -EINVAL;
728 parm->parm.capture.readbuffers = 1; 726 parm->parm.capture.readbuffers = 1;
729 v4l2_video_std_frame_period(vv->standard->id, 727 v4l2_video_std_frame_period(vv->standard->id,
730 &parm->parm.capture.timeperframe); 728 &parm->parm.capture.timeperframe);