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/se401.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/se401.c')
| -rw-r--r-- | linux/drivers/media/video/se401.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/linux/drivers/media/video/se401.c b/linux/drivers/media/video/se401.c index c4f83c5b3..8935c1632 100644 --- a/linux/drivers/media/video/se401.c +++ b/linux/drivers/media/video/se401.c @@ -983,8 +983,7 @@ static int se401_close(struct inode *inode, struct file *file) return 0; } -static int se401_do_ioctl(struct inode *inode, struct file *file, - unsigned int cmd, void *arg) +static int se401_do_ioctl(struct file *file, unsigned int cmd, void *arg) { struct video_device *vdev = file->private_data; struct usb_se401 *se401 = (struct usb_se401 *)vdev; @@ -1150,7 +1149,7 @@ static int se401_do_ioctl(struct inode *inode, struct file *file, static int se401_ioctl(struct inode *inode, struct file *file, unsigned int cmd, unsigned long arg) { - return video_usercopy(inode, file, cmd, arg, se401_do_ioctl); + return video_usercopy(file, cmd, arg, se401_do_ioctl); } static ssize_t se401_read(struct file *file, char __user *buf, |