summaryrefslogtreecommitdiffstats
path: root/drivers/staging/media/hantro/hantro_h264.c
diff options
context:
space:
mode:
authorEzequiel Garcia <ezequiel@collabora.com>2020-08-25 05:52:38 +0200
committerMauro Carvalho Chehab <mchehab+huawei@kernel.org>2020-09-01 14:13:28 +0200
commit057c4452894a38e4cc256858425b2c756003a92f (patch)
tree2e9fae009d419fe62991d2651d17240088629fe9 /drivers/staging/media/hantro/hantro_h264.c
parent54889c51b833d236228f983be16212fbe806bb89 (diff)
downloadlinux-057c4452894a38e4cc256858425b2c756003a92f.tar.bz2
media: hantro: Don't require unneeded H264_SLICE_PARAMS
Now that slice invariant parameters have been moved, the driver no longer needs this control, so drop it. Signed-off-by: Ezequiel Garcia <ezequiel@collabora.com> Tested-by: Jonas Karlman <jonas@kwiboo.se> Signed-off-by: Hans Verkuil <hverkuil-cisco@xs4all.nl> Signed-off-by: Mauro Carvalho Chehab <mchehab+huawei@kernel.org>
Diffstat (limited to 'drivers/staging/media/hantro/hantro_h264.c')
-rw-r--r--drivers/staging/media/hantro/hantro_h264.c5
1 files changed, 0 insertions, 5 deletions
diff --git a/drivers/staging/media/hantro/hantro_h264.c b/drivers/staging/media/hantro/hantro_h264.c
index 7578a4fc1b16..089bfa9c625b 100644
--- a/drivers/staging/media/hantro/hantro_h264.c
+++ b/drivers/staging/media/hantro/hantro_h264.c
@@ -349,11 +349,6 @@ int hantro_h264_dec_prepare_run(struct hantro_ctx *ctx)
if (WARN_ON(!ctrls->decode))
return -EINVAL;
- ctrls->slices =
- hantro_get_ctrl(ctx, V4L2_CID_MPEG_VIDEO_H264_SLICE_PARAMS);
- if (WARN_ON(!ctrls->slices))
- return -EINVAL;
-
ctrls->sps =
hantro_get_ctrl(ctx, V4L2_CID_MPEG_VIDEO_H264_SPS);
if (WARN_ON(!ctrls->sps))