diff options
Diffstat (limited to 'drivers/media/video/vino.c')
-rw-r--r-- | drivers/media/video/vino.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/media/video/vino.c b/drivers/media/video/vino.c index 63863fa8d65f..88bf845a3d56 100644 --- a/drivers/media/video/vino.c +++ b/drivers/media/video/vino.c | |||
@@ -4237,7 +4237,7 @@ error: | |||
4237 | return ret; | 4237 | return ret; |
4238 | } | 4238 | } |
4239 | 4239 | ||
4240 | static int vino_do_ioctl(struct file *file, unsigned int cmd, void *arg) | 4240 | static long vino_do_ioctl(struct file *file, unsigned int cmd, void *arg) |
4241 | { | 4241 | { |
4242 | struct vino_channel_settings *vcs = video_drvdata(file); | 4242 | struct vino_channel_settings *vcs = video_drvdata(file); |
4243 | 4243 | ||
@@ -4343,11 +4343,11 @@ static int vino_do_ioctl(struct file *file, unsigned int cmd, void *arg) | |||
4343 | return 0; | 4343 | return 0; |
4344 | } | 4344 | } |
4345 | 4345 | ||
4346 | static int vino_ioctl(struct file *file, | 4346 | static long vino_ioctl(struct file *file, |
4347 | unsigned int cmd, unsigned long arg) | 4347 | unsigned int cmd, unsigned long arg) |
4348 | { | 4348 | { |
4349 | struct vino_channel_settings *vcs = video_drvdata(file); | 4349 | struct vino_channel_settings *vcs = video_drvdata(file); |
4350 | int ret; | 4350 | long ret; |
4351 | 4351 | ||
4352 | if (mutex_lock_interruptible(&vcs->mutex)) | 4352 | if (mutex_lock_interruptible(&vcs->mutex)) |
4353 | return -EINTR; | 4353 | return -EINTR; |