diff options
Diffstat (limited to 'drivers/media/video/cx18/cx18-ioctl.c')
-rw-r--r-- | drivers/media/video/cx18/cx18-ioctl.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/media/video/cx18/cx18-ioctl.c b/drivers/media/video/cx18/cx18-ioctl.c index 5023075506fb..8aa152b39545 100644 --- a/drivers/media/video/cx18/cx18-ioctl.c +++ b/drivers/media/video/cx18/cx18-ioctl.c | |||
@@ -755,7 +755,7 @@ static int cx18_log_status(struct file *file, void *fh) | |||
755 | return 0; | 755 | return 0; |
756 | } | 756 | } |
757 | 757 | ||
758 | static int cx18_default(struct file *file, void *fh, int cmd, void *arg) | 758 | static long cx18_default(struct file *file, void *fh, int cmd, void *arg) |
759 | { | 759 | { |
760 | struct cx18 *cx = ((struct cx18_open_id *)fh)->cx; | 760 | struct cx18 *cx = ((struct cx18_open_id *)fh)->cx; |
761 | 761 | ||
@@ -783,13 +783,13 @@ static int cx18_default(struct file *file, void *fh, int cmd, void *arg) | |||
783 | return 0; | 783 | return 0; |
784 | } | 784 | } |
785 | 785 | ||
786 | int cx18_v4l2_ioctl(struct file *filp, unsigned int cmd, | 786 | long cx18_v4l2_ioctl(struct file *filp, unsigned int cmd, |
787 | unsigned long arg) | 787 | unsigned long arg) |
788 | { | 788 | { |
789 | struct video_device *vfd = video_devdata(filp); | 789 | struct video_device *vfd = video_devdata(filp); |
790 | struct cx18_open_id *id = (struct cx18_open_id *)filp->private_data; | 790 | struct cx18_open_id *id = (struct cx18_open_id *)filp->private_data; |
791 | struct cx18 *cx = id->cx; | 791 | struct cx18 *cx = id->cx; |
792 | int res; | 792 | long res; |
793 | 793 | ||
794 | mutex_lock(&cx->serialize_lock); | 794 | mutex_lock(&cx->serialize_lock); |
795 | 795 | ||