media: mtk-vcodec: fix error return code in vdec_vp9_decode()
authorZhang Changzhong <zhangchangzhong@huawei.com>
Fri, 4 Dec 2020 08:29:34 +0000 (09:29 +0100)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Thu, 4 Mar 2021 10:37:39 +0000 (11:37 +0100)
[ Upstream commit 4397efebf039be58e98c81a194a26100eba597bb ]

Fix to return a negative error code from the error handling
case instead of 0, as done elsewhere in this function.

Fixes: dea42fb79f4f ("media: mtk-vcodec: reset segment data then trig decoder")
Reported-by: Hulk Robot <hulkci@huawei.com>
Signed-off-by: Zhang Changzhong <zhangchangzhong@huawei.com>
Signed-off-by: Hans Verkuil <hverkuil-cisco@xs4all.nl>
Signed-off-by: Mauro Carvalho Chehab <mchehab+huawei@kernel.org>
Signed-off-by: Sasha Levin <sashal@kernel.org>
drivers/media/platform/mtk-vcodec/vdec/vdec_vp9_if.c

index 5ea153a..d988021 100644 (file)
@@ -890,7 +890,8 @@ static int vdec_vp9_decode(void *h_vdec, struct mtk_vcodec_mem *bs,
                        memset(inst->seg_id_buf.va, 0, inst->seg_id_buf.size);
 
                        if (vsi->show_frame & BIT(2)) {
-                               if (vpu_dec_start(&inst->vpu, NULL, 0)) {
+                               ret = vpu_dec_start(&inst->vpu, NULL, 0);
+                               if (ret) {
                                        mtk_vcodec_err(inst, "vpu trig decoder failed");
                                        goto DECODE_ERROR;
                                }