From: Mauro Carvalho Chehab <mchehab@infradead.org>
Date: Mon, 20 Nov 2006 15:13:25 +0000 (-0300)
Subject: V4L/DVB (4860): Optimization of v4l1 handling
X-Git-Tag: Ubuntu-5.10.0-12.13~50526^2~18^2~71
X-Git-Url: https://git.proxmox.com/?a=commitdiff_plain;h=207705cd7f82b9f160c6ed552d5788a823701fd1;p=mirror_ubuntu-hirsute-kernel.git

V4L/DVB (4860): Optimization of v4l1 handling

Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
---

diff --git a/drivers/media/video/videodev.c b/drivers/media/video/videodev.c
index 9024ea2557fd..ad42deebdc47 100644
--- a/drivers/media/video/videodev.c
+++ b/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) {