aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/media/video/stv680.c
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/media/video/stv680.c')
-rw-r--r--drivers/media/video/stv680.c5
1 files changed, 2 insertions, 3 deletions
diff --git a/drivers/media/video/stv680.c b/drivers/media/video/stv680.c
index 328c41b1517d..42acc92c182d 100644
--- a/drivers/media/video/stv680.c
+++ b/drivers/media/video/stv680.c
@@ -1132,8 +1132,7 @@ static int stv_close (struct inode *inode, struct file *file)
1132 return 0; 1132 return 0;
1133} 1133}
1134 1134
1135static int stv680_do_ioctl (struct inode *inode, struct file *file, 1135static int stv680_do_ioctl(struct file *file, unsigned int cmd, void *arg)
1136 unsigned int cmd, void *arg)
1137{ 1136{
1138 struct video_device *vdev = file->private_data; 1137 struct video_device *vdev = file->private_data;
1139 struct usb_stv *stv680 = video_get_drvdata(vdev); 1138 struct usb_stv *stv680 = video_get_drvdata(vdev);
@@ -1303,7 +1302,7 @@ static int stv680_do_ioctl (struct inode *inode, struct file *file,
1303static int stv680_ioctl(struct inode *inode, struct file *file, 1302static int stv680_ioctl(struct inode *inode, struct file *file,
1304 unsigned int cmd, unsigned long arg) 1303 unsigned int cmd, unsigned long arg)
1305{ 1304{
1306 return video_usercopy(inode, file, cmd, arg, stv680_do_ioctl); 1305 return video_usercopy(file, cmd, arg, stv680_do_ioctl);
1307} 1306}
1308 1307
1309static int stv680_mmap (struct file *file, struct vm_area_struct *vma) 1308static int stv680_mmap (struct file *file, struct vm_area_struct *vma)