From: Marek Szyprowski Date: Mon, 28 Sep 2020 08:48:44 +0000 (+0200) Subject: media: platform: s5p-mfc: Fix adding a standard frame skip mode control X-Git-Tag: v5.10-rc1~175^2~67 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=6ca3549d870724495f96debfd85e96fa19dd4009;p=thirdparty%2Fkernel%2Flinux.git media: platform: s5p-mfc: Fix adding a standard frame skip mode control 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 Signed-off-by: Hans Verkuil Signed-off-by: Mauro Carvalho Chehab --- diff --git a/drivers/media/platform/s5p-mfc/s5p_mfc_enc.c b/drivers/media/platform/s5p-mfc/s5p_mfc_enc.c index 3092eb6777a5c..acc2217dd7e90 100644 --- a/drivers/media/platform/s5p-mfc/s5p_mfc_enc.c +++ b/drivers/media/platform/s5p-mfc/s5p_mfc_enc.c @@ -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, },