diff options
Diffstat (limited to 'linux/drivers/media/video/v4l2-ioctl.c')
| -rw-r--r-- | linux/drivers/media/video/v4l2-ioctl.c | 16 |
1 files changed, 6 insertions, 10 deletions
diff --git a/linux/drivers/media/video/v4l2-ioctl.c b/linux/drivers/media/video/v4l2-ioctl.c index 301000661..a6f76c960 100644 --- a/linux/drivers/media/video/v4l2-ioctl.c +++ b/linux/drivers/media/video/v4l2-ioctl.c @@ -1769,7 +1769,7 @@ static int __video_do_ioctl(struct file *file, return ret; } -int video_ioctl2(struct inode *inode, struct file *file, +int __video_ioctl2(struct file *file, unsigned int cmd, unsigned long arg) { char sbuf[128]; @@ -1861,15 +1861,11 @@ out: kfree(mbuf); return err; } -EXPORT_SYMBOL(video_ioctl2); +EXPORT_SYMBOL(__video_ioctl2); -long video_ioctl2_unlocked(struct file *file, - unsigned int cmd, unsigned long arg) +int video_ioctl2(struct inode *inode, struct file *file, + unsigned int cmd, unsigned long arg) { -#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 20) - return video_ioctl2(file->f_dentry->d_inode, file, cmd, arg); -#else - return video_ioctl2(file->f_path.dentry->d_inode, file, cmd, arg); -#endif + return __video_ioctl2(file, cmd, arg); } -EXPORT_SYMBOL(video_ioctl2_unlocked); +EXPORT_SYMBOL(video_ioctl2); |