aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/media/video/v4l2-ioctl.c
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/media/video/v4l2-ioctl.c')
-rw-r--r--drivers/media/video/v4l2-ioctl.c8
1 files changed, 3 insertions, 5 deletions
diff --git a/drivers/media/video/v4l2-ioctl.c b/drivers/media/video/v4l2-ioctl.c
index eef5814aebe5..0e648cb3b399 100644
--- a/drivers/media/video/v4l2-ioctl.c
+++ b/drivers/media/video/v4l2-ioctl.c
@@ -393,10 +393,8 @@ video_fix_command(unsigned int cmd)
393 * Obsolete usercopy function - Should be removed soon 393 * Obsolete usercopy function - Should be removed soon
394 */ 394 */
395int 395int
396video_usercopy(struct inode *inode, struct file *file, 396video_usercopy(struct file *file, unsigned int cmd, unsigned long arg,
397 unsigned int cmd, unsigned long arg, 397 v4l2_kioctl func)
398 int (*func)(struct inode *inode, struct file *file,
399 unsigned int cmd, void *arg))
400{ 398{
401 char sbuf[128]; 399 char sbuf[128];
402 void *mbuf = NULL; 400 void *mbuf = NULL;
@@ -458,7 +456,7 @@ video_usercopy(struct inode *inode, struct file *file,
458 } 456 }
459 457
460 /* call driver */ 458 /* call driver */
461 err = func(inode, file, cmd, parg); 459 err = func(file, cmd, parg);
462 if (err == -ENOIOCTLCMD) 460 if (err == -ENOIOCTLCMD)
463 err = -EINVAL; 461 err = -EINVAL;
464 if (is_ext_ctrl) { 462 if (is_ext_ctrl) {