From 69af841a9c38318c6385c330d0bfd2746874841e Mon Sep 17 00:00:00 2001 From: Hans Verkuil Date: Wed, 3 Sep 2008 16:46:50 -0300 Subject: [PATCH] --- yaml --- r: 109507 b: refs/heads/master c: 888fe747b5d134e2f3b5c2d3ecc25e1c6dcad4c3 h: refs/heads/master i: 109505: 5968cfa0f049f622e263f517cab5b000aaa359f7 109503: 00be7dd28660926af2eb9e2cf39bc8ac3cdd12cf v: v3 --- [refs] | 2 +- trunk/drivers/media/video/v4l2-ioctl.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 2e42b8aaddaf..e21b27ef2a9c 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: e908b6e34c1b799c830cae5f8e721f80534f9748 +refs/heads/master: 888fe747b5d134e2f3b5c2d3ecc25e1c6dcad4c3 diff --git a/trunk/drivers/media/video/v4l2-ioctl.c b/trunk/drivers/media/video/v4l2-ioctl.c index fdfe7739c96e..88c0465aede4 100644 --- a/trunk/drivers/media/video/v4l2-ioctl.c +++ b/trunk/drivers/media/video/v4l2-ioctl.c @@ -674,7 +674,7 @@ static int __video_do_ioctl(struct inode *inode, struct file *file, __video_do_ioctl will be called again, with one or more V4L2 ioctls. ********************************************************/ - if (_IOC_TYPE(cmd) == 'v') + if (_IOC_TYPE(cmd) == 'v' && _IOC_NR(cmd) < BASE_VIDIOCPRIVATE) return v4l_compat_translate_ioctl(inode, file, cmd, arg, __video_do_ioctl); #endif