]> git.ipfire.org Git - thirdparty/kernel/stable.git/commitdiff
media: v4l2-ctrls.c: initialize flags field of p_fwht_params
authorHans Verkuil <hverkuil-cisco@xs4all.nl>
Fri, 12 Mar 2021 08:49:55 +0000 (09:49 +0100)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Wed, 12 May 2021 06:39:44 +0000 (08:39 +0200)
[ Upstream commit ea1611ba3a544b34f89ffa3d1e833caab30a3f09 ]

The V4L2_CID_STATELESS_FWHT_PARAMS compound control was missing a
proper initialization of the flags field, so after loading the vicodec
module for the first time, running v4l2-compliance for the stateless
decoder would fail on this control because the initial control value
was considered invalid by the vicodec driver.

Initializing the flags field to sane values fixes this.

Signed-off-by: Hans Verkuil <hverkuil-cisco@xs4all.nl>
Signed-off-by: Mauro Carvalho Chehab <mchehab+huawei@kernel.org>
Signed-off-by: Sasha Levin <sashal@kernel.org>
drivers/media/v4l2-core/v4l2-ctrls.c

index 016cf6204cbb879cbcf9356720534a324ca2ce7c..77f63773096e2a70f789224c83992aa3a9aa01e4 100644 (file)
@@ -1675,6 +1675,8 @@ static void std_init_compound(const struct v4l2_ctrl *ctrl, u32 idx,
                p_fwht_params->version = V4L2_FWHT_VERSION;
                p_fwht_params->width = 1280;
                p_fwht_params->height = 720;
+               p_fwht_params->flags = V4L2_FWHT_FL_PIXENC_YUV |
+                       (2 << V4L2_FWHT_FL_COMPONENTS_NUM_OFFSET);
                break;
        }
 }