media: mediatek: vcodec: Handle invalid decoder vsi

commit 59d438f8e02ca641c58d77e1feffa000ff809e9f upstream.

Handle an invalid decoder vsi in vpu_dec_init to ensure the decoder vsi
is valid for future use.

Fixes: 590577a4e525 ("[media] vcodec: mediatek: Add Mediatek V4L2 Video Decoder Driver")

Signed-off-by: Irui Wang <irui.wang@mediatek.com>
Reviewed-by: AngeloGioacchino Del Regno <angelogioacchino.delregno@collabora.com>
Signed-off-by: Sebastian Fricke <sebastian.fricke@collabora.com>
Signed-off-by: Hans Verkuil <hverkuil-cisco@xs4all.nl>
[ Replace mtk_vdec_err with mtk_vcodec_err to make it work on 6.1.y ]
Signed-off-by: Alva Lan <alvalan9@foxmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Irui Wang 2024-03-21 09:47:54 +08:00 committed by Greg Kroah-Hartman
parent 30652c8ceb
commit dbd3e4adb9

View File

@ -213,6 +213,12 @@ int vpu_dec_init(struct vdec_vpu_inst *vpu)
mtk_vcodec_debug(vpu, "vdec_inst=%p", vpu);
err = vcodec_vpu_send_msg(vpu, (void *)&msg, sizeof(msg));
if (IS_ERR_OR_NULL(vpu->vsi)) {
mtk_vcodec_err(vpu, "invalid vdec vsi, status=%d", err);
return -EINVAL;
}
mtk_vcodec_debug(vpu, "- ret=%d", err);
return err;
}