From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-pj2-f41.google.com (mail-pj2-f41.google.com [74.125.227.169]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 06DB13C553F for ; Fri, 25 Sep 2026 04:50:07 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=74.125.227.169 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1790311809; cv=none; b=bCdno6cwf6+chmyZOkHa8XJ71x78AokgCxGpguXrnhDiOu0vI2jVobaRdBzSpVr/3tKC8Q2nePXQd5jYrAtiU74mTW/bNCnQY4WCayS10C9YYUisw17HHrDFHBldMM4psT2rc1IKlnv2P9W5FbxDqCXpPBW2DpLlXBbG1U4bc1o= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1790311809; c=relaxed/simple; bh=XqsJ/oamIOk0pZvu8Ad2mVMfwzmQXZjUOK1YVDL68Sc=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=Im0ANKOfAnXhd59BtPx4bRF8sevKamftFo+wjYsktU5fWP9bkw2n5KdLHzAJDhni48BFXQtdzA60D+OTp2daOGGefjicrCd+9Ciz7jgqxuRtQCWzY3FqUxbXYZKCg5xlnsw8b3ZZYbqUj8WwFUDIvWfShajp4jSAMkqm/rP1aGY= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=MaGpTo0i; arc=none smtp.client-ip=74.125.227.169 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="MaGpTo0i" Received: by mail-pj2-f41.google.com with SMTP id 98e67ed59e1d1-3a0b18f811cso396834a91.0 for ; Thu, 24 Sep 2026 21:50:07 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1790311807; x=1790916607; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to:content-type; bh=EuT5sR3QJJEpUFIiZqumIPgjPq3lYxiQww7DYh2KWes=; b=MaGpTo0iNj5rJoAuny9AgTFIUm8kW41YHB2fuWEhL+skuSBEDeEzHu45mQiQlx5cg3 wUVfD3Fn4Gn/8Y9LeV2nclxrdNiqMnM7u+nW7c44ZdDwEVunaWpmrD4ob0D9BJqQOvJI 3MvQVT8/u3FDFm98m3Y8NYUZtyw/T7Pep4e/Y8VufO2MfKMS8DqQhY8KQCVCiW+dDuzi YewF5cACzzpYAnPfsN9iaELJXsy8Id5twVfR2/9CJiHH8Myb2GoEA9Uy1y3cRSdy+7LO tTe/Mp/FB8bT2CHpNDEeWqIp8gmB20ipZO1CLHMiUsFf+Z4DKn6dj8J3Ihp+BV9hvA2c UAqA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20260707; t=1790311807; x=1790916607; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to:content-type; bh=EuT5sR3QJJEpUFIiZqumIPgjPq3lYxiQww7DYh2KWes=; b=Ep//4isIpE+eTdeQ0ben6DaVExSJ6KbKuqw2Jp57vuu9a85eQAn0XbZbbMSj04kGr1 Cz2M7jMeUPf3HNux1XKg6n//XDx51k7ID3iIWOSzsMF20WM/QYVny6uAeaavb4RpLgoN 8tLrT65n7hzsUT+sihVz13rnmpegWI69QEH0FCnAIOIjXXlgOfmULThRVezjvljLG3Hk hN8W2n+2fTRX4LB7T8pPv+F9Pd4fjM6qUaQETkIMHMEFynZ4/c9BMLIwzV8nbDh8qXxt SX07PqOSyVtptRPT6ytAdRPBLMkKh5uQabvRHjQJjt8Gv1jJYcFKQ7yR+Vp9BAQiHwsN YRTg== X-Forwarded-Encrypted: i=1; AKwUvBxNU3mpMMxCY2giFjvWLF9A8qmU6yAW7NkQ5BrRPpFr5Mfir/pWXuLloPl5PjtgVRbz0blsQSKpg40C8Tw=@vger.kernel.org X-Gm-Message-State: AFuF++kAzIeBobQbaeU6fkXsEAL1nx9m8h0hGbfSFd0aMBcPOCiFxawx AgekLSakczQAce+ySFa+6Bj/+TU3axf7co5QdkwRDYttQPzLX/UoYrGB X-Gm-Gg: AYBFou2xG5zFa6djJ71kmk18zXtyfravPeVH7MDmclRK2mvYtQuKaKlltJ7Saw2uP+R WQewRzMmyCKBiYKjBm870bocskfPcg7I6dfxCACgiPRTfCgunLqZ+Tm/jPbg91ce20JXcjGWExO WMrgchGW56MlA8lZ+8sxNEAcbI1pjjE3sWIxVCJ+X0ICWywDvipsNZQHTeTWzSF/yUeYM7JEj8T TuFguhgA1Fo9wFXWC/96Zevlnuyw/rKK2YOaJlSm6WzD49dVeWc9hdgaz3mHEWbldWXGkgrS/lI dfnCTeTNQwXIzQ8DfT2+3jg633esorZmazD/yVmFI76CO1gHj8d8WyKKRaDcijYU+f/HvzxNd05 ppxdPLxweCbascp7+r/QJgHANHtZTUwwT8H0Yjkf44KxnjG9Ni+qtGHqYJs6BDdI/D8QR2PmVWK 6KejXzdQ5aq+1kUtPJeKYsFuwAvp4k7iTgzAZegoTUsQl3wFQ50JQMw6z3CVG++LoANH/kTg+yZ Jt5g7UeK1oQFeoshP4bJ7aWih+VjG2UejQJu9CuZ5RBLlhJVLljktWc/97TiPA3ejUkfxsIYgmo SMcbeYRfoNDi/w== X-Received: by 2002:a17:90b:1b06:b0:3a0:8133:69a0 with SMTP id 98e67ed59e1d1-3a098b93cb8mr4058209a91.14.1790311807298; Thu, 24 Sep 2026 21:50:07 -0700 (PDT) Received: from phuc-desktop.. ([183.91.15.56]) by smtp.gmail.com with ESMTPSA id 98e67ed59e1d1-3a0976cacbesm8151528a91.13.2026.09.24.21.50.03 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 24 Sep 2026 21:50:07 -0700 (PDT) From: phucduc.bui@gmail.com To: Mark Brown , AngeloGioacchino Del Regno , Trevor Wu Cc: Liam Girdwood , Matthias Brugger , Jaroslav Kysela , Takashi Iwai , Kuninori Morimoto , cassiogabrielcontato@gmail.com, Mukesh Ojha , Liviu Dudau , Haotian Zhang , HariKrishna Sagala , linux-sound@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-mediatek@lists.infradead.org, linux-kernel@vger.kernel.org, bui duc phuc Subject: [PATCH 03/14] ASoC: mediatek: mt8195: Fix register access clock error handling Date: Fri, 25 Sep 2026 11:48:57 +0700 Message-ID: <20260925044908.450775-4-phucduc.bui@gmail.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20260925044908.450775-1-phucduc.bui@gmail.com> References: <20260925044908.450775-1-phucduc.bui@gmail.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit From: bui duc phuc Check the return value of mt8195_afe_enable_clk() when enabling the register access clocks. If enabling a clock fails, disable the clocks that were already enabled and propagate the error to the caller Fixes: 6746cc858259 ("ASoC: mediatek: mt8195: add platform driver") Signed-off-by: bui duc phuc --- sound/soc/mediatek/mt8195/mt8195-afe-clk.c | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/sound/soc/mediatek/mt8195/mt8195-afe-clk.c b/sound/soc/mediatek/mt8195/mt8195-afe-clk.c index 12d8159338be..34c828fdea29 100644 --- a/sound/soc/mediatek/mt8195/mt8195-afe-clk.c +++ b/sound/soc/mediatek/mt8195/mt8195-afe-clk.c @@ -599,7 +599,7 @@ static int mt8195_afe_disable_top_cg(struct mtk_base_afe *afe, unsigned int cg_t int mt8195_afe_enable_reg_rw_clk(struct mtk_base_afe *afe) { struct mt8195_afe_private *afe_priv = afe->platform_priv; - int i; + int i, ret; static const unsigned int clk_array[] = { MT8195_CLK_SCP_ADSP_AUDIODSP, /* bus clock for infra */ MT8195_CLK_TOP_AUDIO_H_SEL, /* clock for ADSP bus */ @@ -611,10 +611,19 @@ int mt8195_afe_enable_reg_rw_clk(struct mtk_base_afe *afe) MT8195_CLK_AUD_A1SYS, /* AFE HW clock */ }; - for (i = 0; i < ARRAY_SIZE(clk_array); i++) - mt8195_afe_enable_clk(afe, afe_priv->clk[clk_array[i]]); + for (i = 0; i < ARRAY_SIZE(clk_array); i++) { + ret = mt8195_afe_enable_clk(afe, afe_priv->clk[clk_array[i]]); + if (ret) + goto err_disable_clk; + } return 0; + +err_disable_clk: + while (--i >= 0) + mt8195_afe_disable_clk(afe, afe_priv->clk[clk_array[i]]); + + return ret; } int mt8195_afe_disable_reg_rw_clk(struct mtk_base_afe *afe) -- 2.43.0