aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/media/video/videodev.c
diff options
context:
space:
mode:
authorTrent Piepho <xyzzy@speakeasy.org>2007-01-22 21:31:53 -0500
committerMauro Carvalho Chehab <mchehab@infradead.org>2007-02-21 10:34:54 -0500
commitdbbff48f39263f7e5c96a55624da87879de2bf71 (patch)
tree8baff62c9a7235bc1578952907f5ae6f271afe41 /drivers/media/video/videodev.c
parent758117c25b65ed5fa502c13f3cdf040a8f954161 (diff)
V4L/DVB (5144): Restore VIDIOC_INT_[SG]_REGISTER calls
Add support for these ioctls to the video_ioctl2 system and the cx88 driver. Signed-off-by: Trent Piepho <xyzzy@speakeasy.org> Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Diffstat (limited to 'drivers/media/video/videodev.c')
-rw-r--r--drivers/media/video/videodev.c16
1 files changed, 16 insertions, 0 deletions
diff --git a/drivers/media/video/videodev.c b/drivers/media/video/videodev.c
index a786c1f5b960..4b5d5f771e4c 100644
--- a/drivers/media/video/videodev.c
+++ b/drivers/media/video/videodev.c
@@ -1453,6 +1453,22 @@ static int __video_do_ioctl(struct inode *inode, struct file *file,
1453 ret=vfd->vidioc_log_status(file, fh); 1453 ret=vfd->vidioc_log_status(file, fh);
1454 break; 1454 break;
1455 } 1455 }
1456#ifdef CONFIG_VIDEO_ADV_DEBUG
1457 case VIDIOC_INT_G_REGISTER:
1458 {
1459 struct v4l2_register *p=arg;
1460 if (vfd->vidioc_g_register)
1461 ret=vfd->vidioc_g_register(file, fh, p);
1462 break;
1463 }
1464 case VIDIOC_INT_S_REGISTER:
1465 {
1466 struct v4l2_register *p=arg;
1467 if (vfd->vidioc_s_register)
1468 ret=vfd->vidioc_s_register(file, fh, p);
1469 break;
1470 }
1471#endif
1456 } /* switch */ 1472 } /* switch */
1457 1473
1458 if (vfd->debug & V4L2_DEBUG_IOCTL_ARG) { 1474 if (vfd->debug & V4L2_DEBUG_IOCTL_ARG) {