---

yaml --- r: 109507 b: refs/heads/master c: 888fe74 h: refs/heads/master i: 109505: 5968cfa 109503: 00be7dd v: v3
git-mirror · Sep 3, 2008 · 69af841 · 69af841
1 parent 640f92a
commit 69af841
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git 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
@@ -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