diff options
Diffstat (limited to 'drivers/media/video/bw-qcam.c')
-rw-r--r-- | drivers/media/video/bw-qcam.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/drivers/media/video/bw-qcam.c b/drivers/media/video/bw-qcam.c index ace4ff9ea023..17f80d03f38e 100644 --- a/drivers/media/video/bw-qcam.c +++ b/drivers/media/video/bw-qcam.c | |||
@@ -706,8 +706,7 @@ static long qc_capture(struct qcam_device * q, char __user *buf, unsigned long l | |||
706 | * Video4linux interfacing | 706 | * Video4linux interfacing |
707 | */ | 707 | */ |
708 | 708 | ||
709 | static int qcam_do_ioctl(struct inode *inode, struct file *file, | 709 | static int qcam_do_ioctl(struct file *file, unsigned int cmd, void *arg) |
710 | unsigned int cmd, void *arg) | ||
711 | { | 710 | { |
712 | struct video_device *dev = video_devdata(file); | 711 | struct video_device *dev = video_devdata(file); |
713 | struct qcam_device *qcam=(struct qcam_device *)dev; | 712 | struct qcam_device *qcam=(struct qcam_device *)dev; |
@@ -867,7 +866,7 @@ static int qcam_do_ioctl(struct inode *inode, struct file *file, | |||
867 | static int qcam_ioctl(struct inode *inode, struct file *file, | 866 | static int qcam_ioctl(struct inode *inode, struct file *file, |
868 | unsigned int cmd, unsigned long arg) | 867 | unsigned int cmd, unsigned long arg) |
869 | { | 868 | { |
870 | return video_usercopy(inode, file, cmd, arg, qcam_do_ioctl); | 869 | return video_usercopy(file, cmd, arg, qcam_do_ioctl); |
871 | } | 870 | } |
872 | 871 | ||
873 | static ssize_t qcam_read(struct file *file, char __user *buf, | 872 | static ssize_t qcam_read(struct file *file, char __user *buf, |