summaryrefslogtreecommitdiffstats
path: root/drivers/media/video/videodev.c
diff options
context:
space:
mode:
authorMauro Carvalho Chehab <mchehab@infradead.org>2006-11-20 16:13:25 +0100
committerMauro Carvalho Chehab <mchehab@infradead.org>2006-12-10 12:05:00 +0100
commit207705cd7f82b9f160c6ed552d5788a823701fd1 (patch)
treeb104a6ee0bf1a8fcae97b8db67d1b64c82e92808 /drivers/media/video/videodev.c
parentV4L/DVB (4859): Fix initializations on some video_ioctl2 handlers (diff)
downloadlinux-207705cd7f82b9f160c6ed552d5788a823701fd1.tar.xz
linux-207705cd7f82b9f160c6ed552d5788a823701fd1.zip
V4L/DVB (4860): Optimization of v4l1 handling
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Diffstat (limited to 'drivers/media/video/videodev.c')
-rw-r--r--drivers/media/video/videodev.c11
1 files changed, 5 insertions, 6 deletions
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) {