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

Commit 2eda1826 authored by qctecmdr's avatar qctecmdr Committed by Gerrit - the friendly Code Review server
Browse files

Merge "v4l2: Allow ioctl type of "U" for video devices like usb camera"

parents ba950c6c 7c768b08

drivers/media/v4l2-core/v4l2-compat-ioctl32.c

+2 −1
Original line number Diff line number Diff line
@@ -1267,7 +1267,8 @@ long v4l2_compat_ioctl32(struct file *file, unsigned int cmd, unsigned long arg) 
	if (!file->f_op->unlocked_ioctl)

		return ret;



	if (_IOC_TYPE(cmd) == 'V' && _IOC_NR(cmd) < BASE_VIDIOC_PRIVATE)

	if (((_IOC_TYPE(cmd) == 'V') || (_IOC_TYPE(cmd) == 'U')) &&

					_IOC_NR(cmd) < BASE_VIDIOC_PRIVATE)

		ret = do_video_ioctl(file, cmd, arg);

	else if (vdev->fops->compat_ioctl32)

		ret = vdev->fops->compat_ioctl32(file, cmd, arg);