diff options
Diffstat (limited to 'drivers/media/common/saa7146_video.c')
-rw-r--r-- | drivers/media/common/saa7146_video.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/drivers/media/common/saa7146_video.c b/drivers/media/common/saa7146_video.c index 101b01dbb8ea..6098b626811f 100644 --- a/drivers/media/common/saa7146_video.c +++ b/drivers/media/common/saa7146_video.c | |||
@@ -834,13 +834,14 @@ static int video_end(struct saa7146_fh *fh, struct file *file) | |||
834 | * copying is done already, arg is a kernel pointer. | 834 | * copying is done already, arg is a kernel pointer. |
835 | */ | 835 | */ |
836 | 836 | ||
837 | int saa7146_video_do_ioctl(struct file *file, unsigned int cmd, void *arg) | 837 | long saa7146_video_do_ioctl(struct file *file, unsigned int cmd, void *arg) |
838 | { | 838 | { |
839 | struct saa7146_fh *fh = file->private_data; | 839 | struct saa7146_fh *fh = file->private_data; |
840 | struct saa7146_dev *dev = fh->dev; | 840 | struct saa7146_dev *dev = fh->dev; |
841 | struct saa7146_vv *vv = dev->vv_data; | 841 | struct saa7146_vv *vv = dev->vv_data; |
842 | 842 | ||
843 | int err = 0, result = 0, ee = 0; | 843 | long err = 0; |
844 | int result = 0, ee = 0; | ||
844 | 845 | ||
845 | struct saa7146_use_ops *ops; | 846 | struct saa7146_use_ops *ops; |
846 | struct videobuf_queue *q; | 847 | struct videobuf_queue *q; |