diff options
| author | Jean-Francois Moine <moinejf@free.fr> | 2008-11-07 08:46:07 +0100 |
|---|---|---|
| committer | Jean-Francois Moine <moinejf@free.fr> | 2008-11-07 08:46:07 +0100 |
| commit | 8bf5ff37ec43c9afcf8a352754624f6462c06a02 (patch) | |
| tree | c407189bc8a36c3b5d452a13692037949858e7f2 /linux/drivers/media/video/saa5246a.c | |
| parent | 4c6dca7b19e1055dd0d4aaa8123c9a832f117202 (diff) | |
| parent | 17490135b2a7a46fc7fb67d64dbaeb1301ea169d (diff) | |
| download | mediapointer-dvb-s2-8bf5ff37ec43c9afcf8a352754624f6462c06a02.tar.gz mediapointer-dvb-s2-8bf5ff37ec43c9afcf8a352754624f6462c06a02.tar.bz2 | |
merge: v4l-dvb
Diffstat (limited to 'linux/drivers/media/video/saa5246a.c')
| -rw-r--r-- | linux/drivers/media/video/saa5246a.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/linux/drivers/media/video/saa5246a.c b/linux/drivers/media/video/saa5246a.c index 154bc7cb0..086fc807a 100644 --- a/linux/drivers/media/video/saa5246a.c +++ b/linux/drivers/media/video/saa5246a.c @@ -805,8 +805,7 @@ static inline int saa5246a_stop_dau(struct saa5246a_device *t, * * Returns 0 if successful */ -static int do_saa5246a_ioctl(struct inode *inode, struct file *file, - unsigned int cmd, void *arg) +static int do_saa5246a_ioctl(struct file *file, unsigned int cmd, void *arg) { struct saa5246a_device *t = video_drvdata(file); @@ -954,7 +953,7 @@ static int saa5246a_ioctl(struct inode *inode, struct file *file, cmd = vtx_fix_command(cmd); mutex_lock(&t->lock); - err = video_usercopy(inode, file, cmd, arg, do_saa5246a_ioctl); + err = video_usercopy(file, cmd, arg, do_saa5246a_ioctl); mutex_unlock(&t->lock); return err; } |