From 9961821ffc5c3df2e55d87d9b82b97a1990c0436 Mon Sep 17 00:00:00 2001 From: Gregor Jasny Date: Thu, 23 Oct 2008 09:55:22 -0300 Subject: [PATCH] --- yaml --- r: 118699 b: refs/heads/master c: c7f09db6852d85e7f76322815051aad1c88d08cf h: refs/heads/master i: 118697: 4ec31da2d90b893f3bcabe62f5adfbc875430b1f 118695: 95b9346fe508967ca62159eea0cb05b5feb224a2 v: v3 --- [refs] | 2 +- trunk/drivers/media/video/compat_ioctl32.c | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index c28c9d042885..c91f5f201963 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: a24ddee36ca10a90451552e6620ff7c4ff7e44b5 +refs/heads/master: c7f09db6852d85e7f76322815051aad1c88d08cf diff --git a/trunk/drivers/media/video/compat_ioctl32.c b/trunk/drivers/media/video/compat_ioctl32.c index bd5d9de5a008..e6ca4012b5f0 100644 --- a/trunk/drivers/media/video/compat_ioctl32.c +++ b/trunk/drivers/media/video/compat_ioctl32.c @@ -867,6 +867,7 @@ long v4l_compat_ioctl32(struct file *file, unsigned int cmd, unsigned long arg) case VIDIOC_STREAMON32: case VIDIOC_STREAMOFF32: case VIDIOC_G_PARM: + case VIDIOC_S_PARM: case VIDIOC_G_STD: case VIDIOC_S_STD: case VIDIOC_G_TUNER: @@ -885,6 +886,8 @@ long v4l_compat_ioctl32(struct file *file, unsigned int cmd, unsigned long arg) case VIDIOC_S_INPUT32: case VIDIOC_TRY_FMT32: case VIDIOC_S_HW_FREQ_SEEK: + case VIDIOC_ENUM_FRAMESIZES: + case VIDIOC_ENUM_FRAMEINTERVALS: ret = do_video_ioctl(file, cmd, arg); break;