Commit 72420630 authored by Mauro Carvalho Chehab's avatar Mauro Carvalho Chehab
Browse files

V4L/DVB: Fix a merge conflict that affects unlock_ioctl 



Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@redhat.com>
parent be737a82

drivers/media/video/v4l2-dev.c

+5 −5
Original line number Diff line number Diff line
@@ -236,19 +236,19 @@ static unsigned int v4l2_poll(struct file *filp, struct poll_table_struct *poll) 
static long v4l2_ioctl(struct file *filp, unsigned int cmd, unsigned long arg)

{

	struct video_device *vdev = video_devdata(filp);

	int ret;

	int ret = -ENODEV;



	if (!vdev->fops->ioctl)

		return -ENOTTY;

	if (vdev->fops->unlocked_ioctl) {

		if (vdev->lock)

			mutex_lock(vdev->lock);

		if (video_is_registered(vdev))

			ret = vdev->fops->unlocked_ioctl(filp, cmd, arg);

		if (vdev->lock)

			mutex_unlock(vdev->lock);

	} else if (vdev->fops->ioctl) {

		/* TODO: convert all drivers to unlocked_ioctl */

		lock_kernel();

		if (video_is_registered(vdev))

			ret = vdev->fops->ioctl(filp, cmd, arg);

		unlock_kernel();

	} else