diff options
author | Marek Szyprowski <m.szyprowski@samsung.com> | 2020-09-28 10:48:44 +0200 |
---|---|---|
committer | Mauro Carvalho Chehab <mchehab+huawei@kernel.org> | 2020-10-01 09:27:47 +0200 |
commit | 6ca3549d870724495f96debfd85e96fa19dd4009 (patch) | |
tree | ad7509673af56ac70e92b01a3523d27d428489b5 /drivers/media | |
parent | media: vidtv: fix decoding with gstreamer and Vlc (diff) | |
download | linux-6ca3549d870724495f96debfd85e96fa19dd4009.tar.xz linux-6ca3549d870724495f96debfd85e96fa19dd4009.zip |
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 <m.szyprowski@samsung.com>
Signed-off-by: Hans Verkuil <hverkuil-cisco@xs4all.nl>
Signed-off-by: Mauro Carvalho Chehab <mchehab+huawei@kernel.org>
Diffstat (limited to 'drivers/media')
-rw-r--r-- | drivers/media/platform/s5p-mfc/s5p_mfc_enc.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/media/platform/s5p-mfc/s5p_mfc_enc.c b/drivers/media/platform/s5p-mfc/s5p_mfc_enc.c index 3092eb6777a5..acc2217dd7e9 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, }, |