Commit 40293722 authored by Xu Qiang's avatar Xu Qiang Committed by Mauro Carvalho Chehab
Browse files

media: meson: vdec: add missing clk_disable_unprepare on error in vdec_hevc_start() 



Add the missing clk_disable_unprepare() before return
from vdec_hevc_start() in the error handling case.

Fixes: 823a7300 (“media: meson: vdec: add common HEVC decoder support”)
Signed-off-by: default avatarXu Qiang <xuqiang36@huawei.com>
Reviewed-by: default avatarNeil Armstrong <narmstrong@baylibre.com>
Signed-off-by: default avatarHans Verkuil <hverkuil-cisco@xs4all.nl>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@kernel.org>
parent 0202a665

drivers/staging/media/meson/vdec/vdec_hevc.c

+5 −1
Original line number Diff line number Diff line
@@ -167,8 +167,12 @@ static int vdec_hevc_start(struct amvdec_session *sess) 


	clk_set_rate(core->vdec_hevc_clk, 666666666);

	ret = clk_prepare_enable(core->vdec_hevc_clk);

	if (ret)

	if (ret) {

		if (core->platform->revision == VDEC_REVISION_G12A ||

		    core->platform->revision == VDEC_REVISION_SM1)

			clk_disable_unprepare(core->vdec_hevcf_clk);

		return ret;

	}



	if (core->platform->revision == VDEC_REVISION_SM1)

		regmap_update_bits(core->regmap_ao, AO_RTI_GEN_PWR_SLEEP0,