diff options
| author | Mauro Carvalho Chehab <mchehab@redhat.com> | 2009-03-29 05:58:58 -0300 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2009-03-29 05:58:58 -0300 |
| commit | 69357393e580dbcd400c7c1992b48813359eb417 (patch) | |
| tree | 27c962a692da9c36cdaa85814eddf5f833ffd777 /linux/drivers/media/video/v4l2-ioctl.c | |
| parent | c1320d2c77e66cf93a7b899cf3764a556c5bc3f9 (diff) | |
| parent | dd151ee816f6d89d08edda36da27880b88c32fae (diff) | |
| download | mediapointer-dvb-s2-69357393e580dbcd400c7c1992b48813359eb417.tar.gz mediapointer-dvb-s2-69357393e580dbcd400c7c1992b48813359eb417.tar.bz2 | |
merge: http://www.linuxtv.org/hg/~hverkuil/v4l-dvb-bttv
From: Mauro Carvalho Chehab <mchehab@redhat.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'linux/drivers/media/video/v4l2-ioctl.c')
| -rw-r--r-- | linux/drivers/media/video/v4l2-ioctl.c | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/linux/drivers/media/video/v4l2-ioctl.c b/linux/drivers/media/video/v4l2-ioctl.c index 5cf729c9d..c16ef96ee 100644 --- a/linux/drivers/media/video/v4l2-ioctl.c +++ b/linux/drivers/media/video/v4l2-ioctl.c @@ -1552,6 +1552,9 @@ static long __video_do_ioctl(struct file *file, struct v4l2_streamparm *p = arg; if (ops->vidioc_g_parm) { + ret = check_fmt(ops, p->type); + if (ret) + break; ret = ops->vidioc_g_parm(file, fh, p); } else { if (p->type != V4L2_BUF_TYPE_VIDEO_CAPTURE) @@ -1571,6 +1574,10 @@ static long __video_do_ioctl(struct file *file, if (!ops->vidioc_s_parm) break; + ret = check_fmt(ops, p->type); + if (ret) + break; + dbgarg(cmd, "type=%d\n", p->type); ret = ops->vidioc_s_parm(file, fh, p); break; |