---

yaml
---
r: 56053
b: refs/heads/master
c: 452c0fb
h: refs/heads/master
i:
  56051: 4a2105b
v: v3

[refs]

@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 1088b1373506fd75d2ac80433b847f116b917bc9
+refs/heads/master: 452c0fb46b1d68b1dae37cea7ccebd70a80397e4

trunk/drivers/media/video/videodev.c

@@ -438,6 +438,12 @@ static int __video_do_ioctl(struct inode *inode, struct file *file,
 	}
 
 #ifdef CONFIG_VIDEO_V4L1_COMPAT
+	/***********************************************************
+	 Handles calls to the obsoleted V4L1 API
+	 Due to the nature of VIDIOCGMBUF, each driver that supports
+	 V4L1 should implement its own handler for this ioctl.
+	 ***********************************************************/
+
 	/* --- streaming capture ------------------------------------- */
 	if (cmd == VIDIOCGMBUF) {
 		struct video_mbuf *p=arg;
@@ -453,11 +459,17 @@ static int __video_do_ioctl(struct inode *inode, struct file *file,
 						(unsigned long)p->offsets);
 		return ret;
 	}
-#endif
 
+	/********************************************************
+	 All other V4L1 calls are handled by v4l1_compat module.
+	 Those calls will be translated into V4L2 calls, and
+	 __video_do_ioctl will be called again, with one or more
+	 V4L2 ioctls.
+	 ********************************************************/
 	if (_IOC_TYPE(cmd)=='v')
 		return v4l_compat_translate_ioctl(inode,file,cmd,arg,
 						__video_do_ioctl);
+#endif
 
 	switch(cmd) {
 	/* --- capabilities ------------------------------------------ */