Commit f0d2b7a8 authored by Boris Brezillon's avatar Boris Brezillon Committed by Mauro Carvalho Chehab
Browse files

media: v4l2: Fix the _MPLANE format check in v4l_enum_fmt() 



CAP_M2M_MPLANE means the device supports _MPLANE formats for both
capture and output. Adjust the check to avoid EINVAL errors on
such devices.

Reported-by: default avatarMaxime Jourdan <mjourdan@baylibre.com>
Signed-off-by: default avatarBoris Brezillon <boris.brezillon@collabora.com>
Reviewed-by: default avatarTomasz Figa <tfiga@chromium.org>
Signed-off-by: default avatarHans Verkuil <hverkuil-cisco@xs4all.nl>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab+samsung@kernel.org>
parent edadd680

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

+7 −2
Original line number Diff line number Diff line
@@ -1385,6 +1385,7 @@ static int v4l_enum_fmt(const struct v4l2_ioctl_ops *ops, 
	struct video_device *vdev = video_devdata(file);

	struct v4l2_fmtdesc *p = arg;

	int ret = check_fmt(file, p->type);

	u32 cap_mask;



	if (ret)

		return ret;
@@ -1393,7 +1394,9 @@ static int v4l_enum_fmt(const struct v4l2_ioctl_ops *ops, 
	switch (p->type) {

	case V4L2_BUF_TYPE_VIDEO_CAPTURE:

	case V4L2_BUF_TYPE_VIDEO_CAPTURE_MPLANE:

		if (!!(vdev->device_caps & V4L2_CAP_VIDEO_CAPTURE_MPLANE) !=

		cap_mask = V4L2_CAP_VIDEO_CAPTURE_MPLANE |

			   V4L2_CAP_VIDEO_M2M_MPLANE;

		if (!!(vdev->device_caps & cap_mask) !=

		    (p->type == V4L2_BUF_TYPE_VIDEO_CAPTURE_MPLANE))

			break;
@@ -1408,7 +1411,9 @@ static int v4l_enum_fmt(const struct v4l2_ioctl_ops *ops, 
		break;

	case V4L2_BUF_TYPE_VIDEO_OUTPUT:

	case V4L2_BUF_TYPE_VIDEO_OUTPUT_MPLANE:

		if (!!(vdev->device_caps & V4L2_CAP_VIDEO_OUTPUT_MPLANE) !=

		cap_mask = V4L2_CAP_VIDEO_OUTPUT_MPLANE |

			   V4L2_CAP_VIDEO_M2M_MPLANE;

		if (!!(vdev->device_caps & cap_mask) !=

		    (p->type == V4L2_BUF_TYPE_VIDEO_OUTPUT_MPLANE))

			break;