aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/media/video/pms.c
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/media/video/pms.c')
-rw-r--r--drivers/media/video/pms.c9
1 files changed, 4 insertions, 5 deletions
diff --git a/drivers/media/video/pms.c b/drivers/media/video/pms.c
index 994807818aa2..45730fac1570 100644
--- a/drivers/media/video/pms.c
+++ b/drivers/media/video/pms.c
@@ -10,8 +10,8 @@
10 * 14478 Potsdam, Germany 10 * 14478 Potsdam, Germany
11 * 11 *
12 * Most of this code is directly derived from his userspace driver. 12 * Most of this code is directly derived from his userspace driver.
13 * His driver works so send any reports to alan@redhat.com unless the 13 * His driver works so send any reports to alan@lxorguk.ukuu.org.uk
14 * userspace driver also doesn't work for you... 14 * unless the userspace driver also doesn't work for you...
15 * 15 *
16 * Changes: 16 * Changes:
17 * 08/07/2003 Daniele Bellucci <bellucda@tiscali.it> 17 * 08/07/2003 Daniele Bellucci <bellucda@tiscali.it>
@@ -680,8 +680,7 @@ static int pms_capture(struct pms_device *dev, char __user *buf, int rgb555, int
680 * Video4linux interfacing 680 * Video4linux interfacing
681 */ 681 */
682 682
683static int pms_do_ioctl(struct inode *inode, struct file *file, 683static int pms_do_ioctl(struct file *file, unsigned int cmd, void *arg)
684 unsigned int cmd, void *arg)
685{ 684{
686 struct video_device *dev = video_devdata(file); 685 struct video_device *dev = video_devdata(file);
687 struct pms_device *pd=(struct pms_device *)dev; 686 struct pms_device *pd=(struct pms_device *)dev;
@@ -866,7 +865,7 @@ static int pms_do_ioctl(struct inode *inode, struct file *file,
866static int pms_ioctl(struct inode *inode, struct file *file, 865static int pms_ioctl(struct inode *inode, struct file *file,
867 unsigned int cmd, unsigned long arg) 866 unsigned int cmd, unsigned long arg)
868{ 867{
869 return video_usercopy(inode, file, cmd, arg, pms_do_ioctl); 868 return video_usercopy(file, cmd, arg, pms_do_ioctl);
870} 869}
871 870
872static ssize_t pms_read(struct file *file, char __user *buf, 871static ssize_t pms_read(struct file *file, char __user *buf,