summaryrefslogtreecommitdiff
path: root/linux/drivers/media/common
diff options
context:
space:
mode:
authorMauro Carvalho Chehab <mchehab@redhat.com>2009-03-29 05:49:03 -0300
committerMauro Carvalho Chehab <mchehab@redhat.com>2009-03-29 05:49:03 -0300
commit9df29ed573b1ae07c6a3cbf4fdbdbbf66c2d3172 (patch)
treec0e3f65bde5ea75d2910a7dd2beb9a131ec49f80 /linux/drivers/media/common
parent941ed87d34bcef83a8a1854d701aab846ba9e7a1 (diff)
parentd52037715e9e029fa316efb4a5a445c339b170cb (diff)
downloadmediapointer-dvb-s2-9df29ed573b1ae07c6a3cbf4fdbdbbf66c2d3172.tar.gz
mediapointer-dvb-s2-9df29ed573b1ae07c6a3cbf4fdbdbbf66c2d3172.tar.bz2
merge: http://linuxtv.org/hg/~tap/v4l-dvb
From: Mauro Carvalho Chehab <mchehab@redhat.com> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'linux/drivers/media/common')
-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);