summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTrent Piepho <xyzzy@speakeasy.org>2009-03-28 18:25:35 -0700
committerTrent Piepho <xyzzy@speakeasy.org>2009-03-28 18:25:35 -0700
commit4e02f28e367a1129eabbf9c8a94c1514d4fc7a8b (patch)
tree03f8fe1fb5109dc3c33e24ac6c803548f827d4f2
parentc6a7ca4c96fd867b70c72a7fdb08866a592dd844 (diff)
downloadmediapointer-dvb-s2-4e02f28e367a1129eabbf9c8a94c1514d4fc7a8b.tar.gz
mediapointer-dvb-s2-4e02f28e367a1129eabbf9c8a94c1514d4fc7a8b.tar.bz2
saa7146: Remove buffer type check from vidioc_g_parm
From: Trent Piepho <xyzzy@speakeasy.org> 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. Priority: normal Signed-off-by: Trent Piepho <xyzzy@speakeasy.org>
-rw-r--r--linux/drivers/media/common/saa7146_video.c2
1 files changed, 0 insertions, 2 deletions
diff --git a/linux/drivers/media/common/saa7146_video.c b/linux/drivers/media/common/saa7146_video.c
index ace925134..46c59da56 100644
--- a/linux/drivers/media/common/saa7146_video.c
+++ b/linux/drivers/media/common/saa7146_video.c
@@ -724,8 +724,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);