aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/media/video/usbvideo/usbvideo.c
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/media/video/usbvideo/usbvideo.c')
-rw-r--r--drivers/media/video/usbvideo/usbvideo.c5
1 files changed, 2 insertions, 3 deletions
diff --git a/drivers/media/video/usbvideo/usbvideo.c b/drivers/media/video/usbvideo/usbvideo.c
index 7c575bb8184f..a42049de2bb6 100644
--- a/drivers/media/video/usbvideo/usbvideo.c
+++ b/drivers/media/video/usbvideo/usbvideo.c
@@ -1281,8 +1281,7 @@ static int usbvideo_v4l_close(struct inode *inode, struct file *file)
1281 * History: 1281 * History:
1282 * 22-Jan-2000 Corrected VIDIOCSPICT to reject unsupported settings. 1282 * 22-Jan-2000 Corrected VIDIOCSPICT to reject unsupported settings.
1283 */ 1283 */
1284static int usbvideo_v4l_do_ioctl(struct inode *inode, struct file *file, 1284static int usbvideo_v4l_do_ioctl(struct file *file, unsigned int cmd, void *arg)
1285 unsigned int cmd, void *arg)
1286{ 1285{
1287 struct uvd *uvd = file->private_data; 1286 struct uvd *uvd = file->private_data;
1288 1287
@@ -1505,7 +1504,7 @@ static int usbvideo_v4l_do_ioctl(struct inode *inode, struct file *file,
1505static int usbvideo_v4l_ioctl(struct inode *inode, struct file *file, 1504static int usbvideo_v4l_ioctl(struct inode *inode, struct file *file,
1506 unsigned int cmd, unsigned long arg) 1505 unsigned int cmd, unsigned long arg)
1507{ 1506{
1508 return video_usercopy(inode, file, cmd, arg, usbvideo_v4l_do_ioctl); 1507 return video_usercopy(file, cmd, arg, usbvideo_v4l_do_ioctl);
1509} 1508}
1510 1509
1511/* 1510/*