diff options
author | Douglas Schilling Landgraf <dougsland@gmail.com> | 2008-04-10 00:18:56 -0400 |
---|---|---|
committer | Mauro Carvalho Chehab <mchehab@infradead.org> | 2008-04-24 13:09:45 -0400 |
commit | 130ca945d83637046bde4943629f011e22831fd3 (patch) | |
tree | a93e328a715c8c26c4b3d8563fc2a6b479f947e7 | |
parent | 87dd965f101bafea7c5e507f686814a0f0057417 (diff) |
V4L/DVB (7665): videodev: Add default vidioc handler
Added default vidioc handler for other private ioctls
Signed-off-by: Douglas Schilling Landgraf <dougsland@gmail.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
-rw-r--r-- | drivers/media/video/videodev.c | 7 | ||||
-rw-r--r-- | include/media/v4l2-dev.h | 4 |
2 files changed, 11 insertions, 0 deletions
diff --git a/drivers/media/video/videodev.c b/drivers/media/video/videodev.c index effcd2ae4152..31e8af0ba278 100644 --- a/drivers/media/video/videodev.c +++ b/drivers/media/video/videodev.c | |||
@@ -1861,6 +1861,13 @@ static int __video_do_ioctl(struct inode *inode, struct file *file, | |||
1861 | dbgarg (cmd, "chip_ident=%u, revision=0x%x\n", p->ident, p->revision); | 1861 | dbgarg (cmd, "chip_ident=%u, revision=0x%x\n", p->ident, p->revision); |
1862 | break; | 1862 | break; |
1863 | } | 1863 | } |
1864 | default: | ||
1865 | { | ||
1866 | if (!vfd->vidioc_default) | ||
1867 | break; | ||
1868 | ret = vfd->vidioc_default(file, fh, cmd, arg); | ||
1869 | break; | ||
1870 | } | ||
1864 | } /* switch */ | 1871 | } /* switch */ |
1865 | 1872 | ||
1866 | if (vfd->debug & V4L2_DEBUG_IOCTL_ARG) { | 1873 | if (vfd->debug & V4L2_DEBUG_IOCTL_ARG) { |
diff --git a/include/media/v4l2-dev.h b/include/media/v4l2-dev.h index f2114459995d..a807d2f86ee8 100644 --- a/include/media/v4l2-dev.h +++ b/include/media/v4l2-dev.h | |||
@@ -318,6 +318,10 @@ struct video_device | |||
318 | int (*vidioc_g_chip_ident) (struct file *file, void *fh, | 318 | int (*vidioc_g_chip_ident) (struct file *file, void *fh, |
319 | struct v4l2_chip_ident *chip); | 319 | struct v4l2_chip_ident *chip); |
320 | 320 | ||
321 | /* For other private ioctls */ | ||
322 | int (*vidioc_default) (struct file *file, void *fh, | ||
323 | int cmd, void *arg); | ||
324 | |||
321 | 325 | ||
322 | #ifdef OBSOLETE_OWNER /* to be removed soon */ | 326 | #ifdef OBSOLETE_OWNER /* to be removed soon */ |
323 | /* obsolete -- fops->owner is used instead */ | 327 | /* obsolete -- fops->owner is used instead */ |