diff options
Diffstat (limited to 'drivers/media/video/c-qcam.c')
-rw-r--r-- | drivers/media/video/c-qcam.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/drivers/media/video/c-qcam.c b/drivers/media/video/c-qcam.c index 0f930d351466..21c71eb085db 100644 --- a/drivers/media/video/c-qcam.c +++ b/drivers/media/video/c-qcam.c | |||
@@ -500,8 +500,7 @@ static long qc_capture(struct qcam_device *q, char __user *buf, unsigned long le | |||
500 | * Video4linux interfacing | 500 | * Video4linux interfacing |
501 | */ | 501 | */ |
502 | 502 | ||
503 | static int qcam_do_ioctl(struct inode *inode, struct file *file, | 503 | static int qcam_do_ioctl(struct file *file, unsigned int cmd, void *arg) |
504 | unsigned int cmd, void *arg) | ||
505 | { | 504 | { |
506 | struct video_device *dev = video_devdata(file); | 505 | struct video_device *dev = video_devdata(file); |
507 | struct qcam_device *qcam=(struct qcam_device *)dev; | 506 | struct qcam_device *qcam=(struct qcam_device *)dev; |
@@ -667,9 +666,9 @@ static int qcam_do_ioctl(struct inode *inode, struct file *file, | |||
667 | } | 666 | } |
668 | 667 | ||
669 | static int qcam_ioctl(struct inode *inode, struct file *file, | 668 | static int qcam_ioctl(struct inode *inode, struct file *file, |
670 | unsigned int cmd, unsigned long arg) | 669 | unsigned int cmd, unsigned long arg) |
671 | { | 670 | { |
672 | return video_usercopy(inode, file, cmd, arg, qcam_do_ioctl); | 671 | return video_usercopy(file, cmd, arg, qcam_do_ioctl); |
673 | } | 672 | } |
674 | 673 | ||
675 | static ssize_t qcam_read(struct file *file, char __user *buf, | 674 | static ssize_t qcam_read(struct file *file, char __user *buf, |