diff options
| author | Hans Verkuil <hverkuil@xs4all.nl> | 2008-10-18 18:39:53 +0200 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2008-10-21 18:31:25 +0200 |
| commit | d5fbf32f381ad841d9d9537aa1b6f74796703361 (patch) | |
| tree | 48149c1f8ace4aae98fb6a8473309cad39da44c9 /drivers/media/video | |
| parent | V4L/DVB (9323): v4l2-int-if: Add enum_framesizes and enum_frameintervals ioctls. (diff) | |
| download | linux-d5fbf32f381ad841d9d9537aa1b6f74796703361.tar.xz linux-d5fbf32f381ad841d9d9537aa1b6f74796703361.zip | |
V4L/DVB (9324): v4l2: add video_ioctl2_unlocked for unlocked_ioctl support.
Based on an older patch from Sakari Ailus.
Cc: Sakari Ailus <sakari.ailus@nokia.com>
Signed-off-by: Hans Verkuil <hverkuil@xs4all.nl>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'drivers/media/video')
| -rw-r--r-- | drivers/media/video/v4l2-ioctl.c | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/drivers/media/video/v4l2-ioctl.c b/drivers/media/video/v4l2-ioctl.c index 155c9d77a463..0417844d4079 100644 --- a/drivers/media/video/v4l2-ioctl.c +++ b/drivers/media/video/v4l2-ioctl.c @@ -630,8 +630,8 @@ static int __video_do_ioctl(struct inode *inode, struct file *file, { struct video_device *vfd = video_devdata(file); const struct v4l2_ioctl_ops *ops = vfd->ioctl_ops; - void *fh = file->private_data; - int ret = -EINVAL; + void *fh = file->private_data; + int ret = -EINVAL; if ((vfd->debug & V4L2_DEBUG_IOCTL) && !(vfd->debug & V4L2_DEBUG_IOCTL_ARG)) { @@ -1861,3 +1861,10 @@ out: return err; } EXPORT_SYMBOL(video_ioctl2); + +long video_ioctl2_unlocked(struct file *file, + unsigned int cmd, unsigned long arg) +{ + return video_ioctl2(file->f_path.dentry->d_inode, file, cmd, arg); +} +EXPORT_SYMBOL(video_ioctl2_unlocked); |