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

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

[media] v4l2-ioctl: fix stupid mistake in cropcap condition 



Fix duplicate tests in condition. The second test for vidioc_cropcap
should have tested for vidioc_g_selection instead.

Signed-off-by: default avatarHans Verkuil <hans.verkuil@cisco.com>
Reported-by: default avatarDavid Binderman <linuxdev.baldrick@gmail.com>
Acked-by: default avatarSakari Ailus <sakari.ailus@linux.intel.com>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@osg.samsung.com>
parent c853f18b

drivers/media/v4l2-core/v4l2-ioctl.c

+1 −1
Original line number Diff line number Diff line
@@ -2171,7 +2171,7 @@ static int v4l_cropcap(const struct v4l2_ioctl_ops *ops, 
	 * The determine_valid_ioctls() call already should ensure

	 * that this can never happen, but just in case...

	 */

	if (WARN_ON(!ops->vidioc_cropcap && !ops->vidioc_cropcap))

	if (WARN_ON(!ops->vidioc_cropcap && !ops->vidioc_g_selection))

		return -ENOTTY;



	if (ops->vidioc_cropcap)