diff options
Diffstat (limited to 'drivers/media/video/saa5246a.c')
-rw-r--r-- | drivers/media/video/saa5246a.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/media/video/saa5246a.c b/drivers/media/video/saa5246a.c index 018dee55b3aa..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 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); |