diff options
Diffstat (limited to 'drivers/media/video/saa5246a.c')
-rw-r--r-- | drivers/media/video/saa5246a.c | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/drivers/media/video/saa5246a.c b/drivers/media/video/saa5246a.c index f159441e9375..e637e440b6d5 100644 --- a/drivers/media/video/saa5246a.c +++ b/drivers/media/video/saa5246a.c | |||
@@ -804,7 +804,7 @@ static inline int saa5246a_stop_dau(struct saa5246a_device *t, | |||
804 | * | 804 | * |
805 | * Returns 0 if successful | 805 | * Returns 0 if successful |
806 | */ | 806 | */ |
807 | static int do_saa5246a_ioctl(struct file *file, unsigned int cmd, void *arg) | 807 | static long do_saa5246a_ioctl(struct file *file, unsigned int cmd, void *arg) |
808 | { | 808 | { |
809 | struct saa5246a_device *t = video_drvdata(file); | 809 | struct saa5246a_device *t = video_drvdata(file); |
810 | 810 | ||
@@ -944,11 +944,11 @@ static inline unsigned int vtx_fix_command(unsigned int cmd) | |||
944 | /* | 944 | /* |
945 | * Handle the locking | 945 | * Handle the locking |
946 | */ | 946 | */ |
947 | static int saa5246a_ioctl(struct inode *inode, struct file *file, | 947 | static long saa5246a_ioctl(struct file *file, |
948 | unsigned int cmd, unsigned long arg) | 948 | unsigned int cmd, unsigned long arg) |
949 | { | 949 | { |
950 | struct saa5246a_device *t = video_drvdata(file); | 950 | struct saa5246a_device *t = video_drvdata(file); |
951 | int err; | 951 | long err; |
952 | 952 | ||
953 | cmd = vtx_fix_command(cmd); | 953 | cmd = vtx_fix_command(cmd); |
954 | mutex_lock(&t->lock); | 954 | mutex_lock(&t->lock); |
@@ -957,7 +957,7 @@ static int saa5246a_ioctl(struct inode *inode, struct file *file, | |||
957 | return err; | 957 | return err; |
958 | } | 958 | } |
959 | 959 | ||
960 | static int saa5246a_open(struct inode *inode, struct file *file) | 960 | static int saa5246a_open(struct file *file) |
961 | { | 961 | { |
962 | struct saa5246a_device *t = video_drvdata(file); | 962 | struct saa5246a_device *t = video_drvdata(file); |
963 | 963 | ||
@@ -999,7 +999,7 @@ static int saa5246a_open(struct inode *inode, struct file *file) | |||
999 | return 0; | 999 | return 0; |
1000 | } | 1000 | } |
1001 | 1001 | ||
1002 | static int saa5246a_release(struct inode *inode, struct file *file) | 1002 | static int saa5246a_release(struct file *file) |
1003 | { | 1003 | { |
1004 | struct saa5246a_device *t = video_drvdata(file); | 1004 | struct saa5246a_device *t = video_drvdata(file); |
1005 | 1005 | ||
@@ -1018,12 +1018,11 @@ static int saa5246a_release(struct inode *inode, struct file *file) | |||
1018 | return 0; | 1018 | return 0; |
1019 | } | 1019 | } |
1020 | 1020 | ||
1021 | static const struct file_operations saa_fops = { | 1021 | static const struct v4l2_file_operations saa_fops = { |
1022 | .owner = THIS_MODULE, | 1022 | .owner = THIS_MODULE, |
1023 | .open = saa5246a_open, | 1023 | .open = saa5246a_open, |
1024 | .release = saa5246a_release, | 1024 | .release = saa5246a_release, |
1025 | .ioctl = saa5246a_ioctl, | 1025 | .ioctl = saa5246a_ioctl, |
1026 | .llseek = no_llseek, | ||
1027 | }; | 1026 | }; |
1028 | 1027 | ||
1029 | static struct video_device saa_template = | 1028 | static struct video_device saa_template = |