From nobody Fri May 3 07:40:59 2024 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 3BFFBC43334 for ; Thu, 23 Jun 2022 07:08:40 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230071AbiFWHIj (ORCPT ); Thu, 23 Jun 2022 03:08:39 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:59412 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229483AbiFWHIi (ORCPT ); Thu, 23 Jun 2022 03:08:38 -0400 Received: from szxga01-in.huawei.com (szxga01-in.huawei.com [45.249.212.187]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id A902E45053 for ; Thu, 23 Jun 2022 00:08:36 -0700 (PDT) Received: from kwepemi500023.china.huawei.com (unknown [172.30.72.54]) by szxga01-in.huawei.com (SkyGuard) with ESMTP id 4LTBCD61YwzkWcV; Thu, 23 Jun 2022 15:07:20 +0800 (CST) Received: from huawei.com (10.175.112.208) by kwepemi500023.china.huawei.com (7.221.188.76) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2375.24; Thu, 23 Jun 2022 15:08:33 +0800 From: Peng Wu To: CC: , , , , Subject: [PATCH v2] soc: mediatek: fix missing clk_disable_unprepare() on err in svs_resume() Date: Thu, 23 Jun 2022 07:02:40 +0000 Message-ID: <20220623070240.63382-1-wupeng58@huawei.com> X-Mailer: git-send-email 2.17.1 MIME-Version: 1.0 X-Originating-IP: [10.175.112.208] X-ClientProxiedBy: dggems704-chm.china.huawei.com (10.3.19.181) To kwepemi500023.china.huawei.com (7.221.188.76) X-CFilter-Loop: Reflected Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Fix the missing clk_disable_unprepare() before return from svs_resume() in the error handling case. Signed-off-by: Peng Wu Reported-by: Hulk Robot --- v2: - Same holds for the error path of svs_init02(). --- drivers/soc/mediatek/mtk-svs.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/drivers/soc/mediatek/mtk-svs.c b/drivers/soc/mediatek/mtk-svs.c index 606a00a2e57d..87e05ab51552 100644 --- a/drivers/soc/mediatek/mtk-svs.c +++ b/drivers/soc/mediatek/mtk-svs.c @@ -1526,16 +1526,20 @@ static int svs_resume(struct device *dev) ret =3D reset_control_deassert(svsp->rst); if (ret) { dev_err(svsp->dev, "cannot deassert reset %d\n", ret); - return ret; + goto out_of_resume; } =20 ret =3D svs_init02(svsp); if (ret) - return ret; + goto out_of_resume; =20 svs_mon_mode(svsp); =20 return 0; + +out_of_resume: + clk_disable_unprepare(svsp->main_clk); + return ret; } =20 static int svs_bank_resource_setup(struct svs_platform *svsp) --=20 2.17.1