From 3808357ec6fc48e3a87151fed4dd24d708ad962a Mon Sep 17 00:00:00 2001
From: Mauro Carvalho Chehab <mchehab@infradead.org>
Date: Mon, 20 Nov 2006 12:13:25 -0300
Subject: [PATCH] --- yaml --- r: 44081 b: refs/heads/master c:
 207705cd7f82b9f160c6ed552d5788a823701fd1 h: refs/heads/master i:   44079:
 3330add079fabb017bd821f83738626a27696c46 v: v3

---
 [refs]                               |  2 +-
 trunk/drivers/media/video/videodev.c | 11 +++++------
 2 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/[refs] b/[refs]
index db80a7b209ec..18fcc490535c 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 7964b1b1c27dea88eb89b10f774893ec11cf973d
+refs/heads/master: 207705cd7f82b9f160c6ed552d5788a823701fd1
diff --git a/trunk/drivers/media/video/videodev.c b/trunk/drivers/media/video/videodev.c
index 9024ea2557fd..ad42deebdc47 100644
--- a/trunk/drivers/media/video/videodev.c
+++ b/trunk/drivers/media/video/videodev.c
@@ -428,6 +428,10 @@ static int __video_do_ioctl(struct inode *inode, struct file *file,
 		v4l_print_ioctl(vfd->name, cmd);
 	}
 
+	if (_IOC_TYPE(cmd)=='v')
+		return v4l_compat_translate_ioctl(inode,file,cmd,arg,
+						__video_do_ioctl);
+
 	switch(cmd) {
 	/* --- capabilities ------------------------------------------ */
 	case VIDIOC_QUERYCAP:
@@ -1409,12 +1413,7 @@ static int __video_do_ioctl(struct inode *inode, struct file *file,
 		ret=vfd->vidioc_log_status(file, fh);
 		break;
 	}
-
-	/* --- Others --------------------------------------------- */
-
-	default:
-		ret=v4l_compat_translate_ioctl(inode,file,cmd,arg,__video_do_ioctl);
-	}
+	} /* switch */
 
 	if (vfd->debug & V4L2_DEBUG_IOCTL_ARG) {
 		if (ret<0) {