Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d5fbf32f authored by Hans Verkuil's avatar Hans Verkuil Committed by Mauro Carvalho Chehab
Browse files

V4L/DVB (9324): v4l2: add video_ioctl2_unlocked for unlocked_ioctl support. 



Based on an older patch from Sakari Ailus.

Cc: Sakari Ailus <sakari.ailus@nokia.com>
Signed-off-by: default avatarHans Verkuil <hverkuil@xs4all.nl>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@redhat.com>
parent f496bc71

drivers/media/video/v4l2-ioctl.c

+9 −2
Original line number Diff line number Diff line
@@ -1861,3 +1861,10 @@ out: 
	return err;

}

EXPORT_SYMBOL(video_ioctl2);



long video_ioctl2_unlocked(struct file *file,

		 unsigned int cmd, unsigned long arg)

{

	return video_ioctl2(file->f_path.dentry->d_inode, file, cmd, arg);

}

EXPORT_SYMBOL(video_ioctl2_unlocked);

include/media/v4l2-ioctl.h

+3 −1
Original line number Diff line number Diff line
@@ -286,6 +286,8 @@ extern long v4l_compat_ioctl32(struct file *file, unsigned int cmd, 


extern int video_ioctl2(struct inode *inode, struct file *file,

			unsigned int cmd, unsigned long arg);

extern long video_ioctl2_unlocked(struct file *file,

			unsigned int cmd, unsigned long arg);



/* Include support for obsoleted stuff */

extern int video_usercopy(struct inode *inode, struct file *file,