media: platform: s5p-mfc: Fix adding a standard frame skip mode control
authorMarek Szyprowski <m.szyprowski@samsung.com>
Mon, 28 Sep 2020 08:48:44 +0000 (10:48 +0200)
committerMauro Carvalho Chehab <mchehab+huawei@kernel.org>
Thu, 1 Oct 2020 07:27:47 +0000 (09:27 +0200)
Add proper control type to the recently introduced
V4L2_CID_MPEG_VIDEO_FRAME_SKIP_MODE control. This will forward it to
v4l2_ctrl_new_std_menu() not v4l2_ctrl_new_std(), what causes the
failure. This fixes the following warning during driver initialization:

s5p_mfc_enc_ctrls_setup:2671: Adding control (18) failed
s5p_mfc_open:811: Failed to setup mfc controls

Fixes: ef56b3ee4f54 ("media: s5p-mfc: Use standard frame skip mode control")
Signed-off-by: Marek Szyprowski <m.szyprowski@samsung.com>
Signed-off-by: Hans Verkuil <hverkuil-cisco@xs4all.nl>
Signed-off-by: Mauro Carvalho Chehab <mchehab+huawei@kernel.org>
drivers/media/platform/s5p-mfc/s5p_mfc_enc.c

index 3092eb6..acc2217 100644 (file)
@@ -263,6 +263,7 @@ static struct mfc_control controls[] = {
        },
        {
                .id = V4L2_CID_MPEG_VIDEO_FRAME_SKIP_MODE,
+               .type = V4L2_CTRL_TYPE_MENU,
                .maximum = V4L2_MPEG_VIDEO_FRAME_SKIP_MODE_BUF_LIMIT,
                .default_value = V4L2_MPEG_VIDEO_FRAME_SKIP_MODE_DISABLED,
        },