diff options
| author |   Hans Verkuil <hverkuil-cisco@xs4all.nl> | 2019-07-24 07:27:03 -0400 |
|---|---|---|
| committer |   Mauro Carvalho Chehab <mchehab+samsung@kernel.org> | 2019-07-30 12:12:05 -0400 |
| commit | 7c490e2561f271a59605ac31e2582d62c918715d (patch) | |
| tree | ab739b99b4df00e5a0fa361e39e56c88ba1415a4 /drivers/media/v4l2-core/v4l2-ioctl.c | |
| parent | Merge tag 'v5.3-rc2' into patchwork (diff) | |
| download | linux-dev-7c490e2561f271a59605ac31e2582d62c918715d.tar.xz linux-dev-7c490e2561f271a59605ac31e2582d62c918715d.zip | |
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>
Diffstat (limited to 'drivers/media/v4l2-core/v4l2-ioctl.c')
| -rw-r--r-- | drivers/media/v4l2-core/v4l2-ioctl.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/media/v4l2-core/v4l2-ioctl.c b/drivers/media/v4l2-core/v4l2-ioctl.c index 9484cc2619e4..bb5b4926538a 100644 --- a/drivers/media/v4l2-core/v4l2-ioctl.c +++ b/drivers/media/v4l2-core/v4l2-ioctl.c @@ -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, |