diff options
| author | Mauro Carvalho Chehab <mchehab@redhat.com> | 2008-11-05 16:15:43 -0200 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2008-11-05 16:15:43 -0200 |
| commit | f908968983a448cba404613e0564a7097b63558f (patch) | |
| tree | 31f33203850a0c4fcde070ee5e0795880ca7c8fd /linux/drivers/media/video/stv680.c | |
| parent | 94703235501e112e7496efe5bce32671e121d98f (diff) | |
| parent | 0cb9746f402b6eb2d3220ae59b522cddf4db9bcd (diff) | |
| download | mediapointer-dvb-s2-f908968983a448cba404613e0564a7097b63558f.tar.gz mediapointer-dvb-s2-f908968983a448cba404613e0564a7097b63558f.tar.bz2 | |
merge: http://linuxtv.org/hg/~awalls/cx18-bugfix
From: Mauro Carvalho Chehab <mchehab@redhat.com>
Priority: normal
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'linux/drivers/media/video/stv680.c')
| -rw-r--r-- | linux/drivers/media/video/stv680.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/linux/drivers/media/video/stv680.c b/linux/drivers/media/video/stv680.c index 5705414f9..be5ed5940 100644 --- a/linux/drivers/media/video/stv680.c +++ b/linux/drivers/media/video/stv680.c @@ -1137,8 +1137,7 @@ static int stv_close (struct inode *inode, struct file *file) return 0; } -static int stv680_do_ioctl (struct inode *inode, struct file *file, - unsigned int cmd, void *arg) +static int stv680_do_ioctl(struct file *file, unsigned int cmd, void *arg) { struct video_device *vdev = file->private_data; struct usb_stv *stv680 = video_get_drvdata(vdev); @@ -1308,7 +1307,7 @@ static int stv680_do_ioctl (struct inode *inode, struct file *file, static int stv680_ioctl(struct inode *inode, struct file *file, unsigned int cmd, unsigned long arg) { - return video_usercopy(inode, file, cmd, arg, stv680_do_ioctl); + return video_usercopy(file, cmd, arg, stv680_do_ioctl); } static int stv680_mmap (struct file *file, struct vm_area_struct *vma) |