Commit 7c490e25 authored Jul 24, 2019 by Hans Verkuil Committed by Mauro Carvalho Chehab Jul 30, 2019

media: v4l2-ioctl.c: OR flags in v4l_fill_fmtdesc(), not don't overwrite



If a driver sets a FMT flag in the enum_fmt op, then that will be
ignored since v4l_fill_fmtdesc() overwrites it again.

v4l_fill_fmtdesc() should OR its flag, not overwrite it.

Signed-off-by: Hans Verkuil <hverkuil-cisco@xs4all.nl>
Signed-off-by: Mauro Carvalho Chehab <mchehab+samsung@kernel.org>

parent 3ac52d0d

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

+1 −1

Original line number	Diff line number	Diff line
		@@ -1395,7 +1395,7 @@ static void v4l_fill_fmtdesc(struct v4l2_fmtdesc *fmt)

		if (descr)
		WARN_ON(strscpy(fmt->description, descr, sz) < 0);
		fmt->flags = flags;
		fmt->flags \|= flags;
		}

		static int v4l_enum_fmt(const struct v4l2_ioctl_ops *ops,

Admin message