diff options
Diffstat (limited to 'drivers/media/video/v4l2-ioctl.c')
-rw-r--r-- | drivers/media/video/v4l2-ioctl.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/media/video/v4l2-ioctl.c b/drivers/media/video/v4l2-ioctl.c index 0417844d4079..5b3e251b9396 100644 --- a/drivers/media/video/v4l2-ioctl.c +++ b/drivers/media/video/v4l2-ioctl.c | |||
@@ -625,7 +625,7 @@ static int check_fmt(const struct v4l2_ioctl_ops *ops, enum v4l2_buf_type type) | |||
625 | return -EINVAL; | 625 | return -EINVAL; |
626 | } | 626 | } |
627 | 627 | ||
628 | static int __video_do_ioctl(struct inode *inode, struct file *file, | 628 | static int __video_do_ioctl(struct file *file, |
629 | unsigned int cmd, void *arg) | 629 | unsigned int cmd, void *arg) |
630 | { | 630 | { |
631 | struct video_device *vfd = video_devdata(file); | 631 | struct video_device *vfd = video_devdata(file); |
@@ -675,7 +675,7 @@ static int __video_do_ioctl(struct inode *inode, struct file *file, | |||
675 | V4L2 ioctls. | 675 | V4L2 ioctls. |
676 | ********************************************************/ | 676 | ********************************************************/ |
677 | if (_IOC_TYPE(cmd) == 'v' && _IOC_NR(cmd) < BASE_VIDIOCPRIVATE) | 677 | if (_IOC_TYPE(cmd) == 'v' && _IOC_NR(cmd) < BASE_VIDIOCPRIVATE) |
678 | return v4l_compat_translate_ioctl(inode, file, cmd, arg, | 678 | return v4l_compat_translate_ioctl(file, cmd, arg, |
679 | __video_do_ioctl); | 679 | __video_do_ioctl); |
680 | #endif | 680 | #endif |
681 | 681 | ||
@@ -1832,7 +1832,7 @@ int video_ioctl2(struct inode *inode, struct file *file, | |||
1832 | } | 1832 | } |
1833 | 1833 | ||
1834 | /* Handles IOCTL */ | 1834 | /* Handles IOCTL */ |
1835 | err = __video_do_ioctl(inode, file, cmd, parg); | 1835 | err = __video_do_ioctl(file, cmd, parg); |
1836 | if (err == -ENOIOCTLCMD) | 1836 | if (err == -ENOIOCTLCMD) |
1837 | err = -EINVAL; | 1837 | err = -EINVAL; |
1838 | if (is_ext_ctrl) { | 1838 | if (is_ext_ctrl) { |