aboutsummaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorMauro Carvalho Chehab <mchehab@infradead.org>2006-11-20 10:13:25 -0500
committerMauro Carvalho Chehab <mchehab@infradead.org>2006-12-10 06:05:00 -0500
commit207705cd7f82b9f160c6ed552d5788a823701fd1 (patch)
treeb104a6ee0bf1a8fcae97b8db67d1b64c82e92808 /drivers
parent7964b1b1c27dea88eb89b10f774893ec11cf973d (diff)
V4L/DVB (4860): Optimization of v4l1 handling
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Diffstat (limited to 'drivers')
-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,
428 v4l_print_ioctl(vfd->name, cmd); 428 v4l_print_ioctl(vfd->name, cmd);
429 } 429 }
430 430
431 if (_IOC_TYPE(cmd)=='v')
432 return v4l_compat_translate_ioctl(inode,file,cmd,arg,
433 __video_do_ioctl);
434
431 switch(cmd) { 435 switch(cmd) {
432 /* --- capabilities ------------------------------------------ */ 436 /* --- capabilities ------------------------------------------ */
433 case VIDIOC_QUERYCAP: 437 case VIDIOC_QUERYCAP:
@@ -1409,12 +1413,7 @@ static int __video_do_ioctl(struct inode *inode, struct file *file,
1409 ret=vfd->vidioc_log_status(file, fh); 1413 ret=vfd->vidioc_log_status(file, fh);
1410 break; 1414 break;
1411 } 1415 }
1412 1416 } /* switch */
1413 /* --- Others --------------------------------------------- */
1414
1415 default:
1416 ret=v4l_compat_translate_ioctl(inode,file,cmd,arg,__video_do_ioctl);
1417 }
1418 1417
1419 if (vfd->debug & V4L2_DEBUG_IOCTL_ARG) { 1418 if (vfd->debug & V4L2_DEBUG_IOCTL_ARG) {
1420 if (ret<0) { 1419 if (ret<0) {