diff options
Diffstat (limited to 'drivers/media/video/vino.c')
-rw-r--r-- | drivers/media/video/vino.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/drivers/media/video/vino.c b/drivers/media/video/vino.c index 1efc5f3462c6..a72a361daade 100644 --- a/drivers/media/video/vino.c +++ b/drivers/media/video/vino.c | |||
@@ -4237,8 +4237,7 @@ error: | |||
4237 | return ret; | 4237 | return ret; |
4238 | } | 4238 | } |
4239 | 4239 | ||
4240 | static int vino_do_ioctl(struct inode *inode, struct file *file, | 4240 | static int vino_do_ioctl(struct file *file, unsigned int cmd, void *arg) |
4241 | unsigned int cmd, void *arg) | ||
4242 | { | 4241 | { |
4243 | struct vino_channel_settings *vcs = video_drvdata(file); | 4242 | struct vino_channel_settings *vcs = video_drvdata(file); |
4244 | 4243 | ||
@@ -4353,7 +4352,7 @@ static int vino_ioctl(struct inode *inode, struct file *file, | |||
4353 | if (mutex_lock_interruptible(&vcs->mutex)) | 4352 | if (mutex_lock_interruptible(&vcs->mutex)) |
4354 | return -EINTR; | 4353 | return -EINTR; |
4355 | 4354 | ||
4356 | ret = video_usercopy(inode, file, cmd, arg, vino_do_ioctl); | 4355 | ret = video_usercopy(file, cmd, arg, vino_do_ioctl); |
4357 | 4356 | ||
4358 | mutex_unlock(&vcs->mutex); | 4357 | mutex_unlock(&vcs->mutex); |
4359 | 4358 | ||