diff options
Diffstat (limited to 'drivers/media/video/saa5246a.c')
| -rw-r--r-- | drivers/media/video/saa5246a.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/drivers/media/video/saa5246a.c b/drivers/media/video/saa5246a.c index 4a21b8a6a709..f159441e9375 100644 --- a/drivers/media/video/saa5246a.c +++ b/drivers/media/video/saa5246a.c | |||
| @@ -15,7 +15,7 @@ | |||
| 15 | * <richard.guenther@student.uni-tuebingen.de> | 15 | * <richard.guenther@student.uni-tuebingen.de> |
| 16 | * | 16 | * |
| 17 | * with changes by | 17 | * with changes by |
| 18 | * Alan Cox <Alan.Cox@linux.org> | 18 | * Alan Cox <alan@lxorguk.ukuu.org.uk> |
| 19 | * | 19 | * |
| 20 | * and | 20 | * and |
| 21 | * | 21 | * |
| @@ -804,8 +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 inode *inode, struct file *file, | 807 | static int do_saa5246a_ioctl(struct file *file, unsigned int cmd, void *arg) |
| 808 | unsigned int cmd, void *arg) | ||
| 809 | { | 808 | { |
| 810 | struct saa5246a_device *t = video_drvdata(file); | 809 | struct saa5246a_device *t = video_drvdata(file); |
| 811 | 810 | ||
| @@ -953,7 +952,7 @@ static int saa5246a_ioctl(struct inode *inode, struct file *file, | |||
| 953 | 952 | ||
| 954 | cmd = vtx_fix_command(cmd); | 953 | cmd = vtx_fix_command(cmd); |
| 955 | mutex_lock(&t->lock); | 954 | mutex_lock(&t->lock); |
| 956 | err = video_usercopy(inode, file, cmd, arg, do_saa5246a_ioctl); | 955 | err = video_usercopy(file, cmd, arg, do_saa5246a_ioctl); |
| 957 | mutex_unlock(&t->lock); | 956 | mutex_unlock(&t->lock); |
| 958 | return err; | 957 | return err; |
| 959 | } | 958 | } |
