aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/media/video/pwc/pwc-if.c
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/media/video/pwc/pwc-if.c')
-rw-r--r--drivers/media/video/pwc/pwc-if.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/media/video/pwc/pwc-if.c b/drivers/media/video/pwc/pwc-if.c
index 315337bfd673..39fbc970f43d 100644
--- a/drivers/media/video/pwc/pwc-if.c
+++ b/drivers/media/video/pwc/pwc-if.c
@@ -147,7 +147,7 @@ static int pwc_video_close(struct file *file);
147static ssize_t pwc_video_read(struct file *file, char __user *buf, 147static ssize_t pwc_video_read(struct file *file, char __user *buf,
148 size_t count, loff_t *ppos); 148 size_t count, loff_t *ppos);
149static unsigned int pwc_video_poll(struct file *file, poll_table *wait); 149static unsigned int pwc_video_poll(struct file *file, poll_table *wait);
150static int pwc_video_ioctl(struct file *file, 150static long pwc_video_ioctl(struct file *file,
151 unsigned int ioctlnr, unsigned long arg); 151 unsigned int ioctlnr, unsigned long arg);
152static int pwc_video_mmap(struct file *file, struct vm_area_struct *vma); 152static int pwc_video_mmap(struct file *file, struct vm_area_struct *vma);
153 153
@@ -1395,12 +1395,12 @@ static unsigned int pwc_video_poll(struct file *file, poll_table *wait)
1395 return 0; 1395 return 0;
1396} 1396}
1397 1397
1398static int pwc_video_ioctl(struct file *file, 1398static long pwc_video_ioctl(struct file *file,
1399 unsigned int cmd, unsigned long arg) 1399 unsigned int cmd, unsigned long arg)
1400{ 1400{
1401 struct video_device *vdev = file->private_data; 1401 struct video_device *vdev = file->private_data;
1402 struct pwc_device *pdev; 1402 struct pwc_device *pdev;
1403 int r = -ENODEV; 1403 long r = -ENODEV;
1404 1404
1405 if (!vdev) 1405 if (!vdev)
1406 goto out; 1406 goto out;