From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-pj1-f51.google.com (mail-pj1-f51.google.com [209.85.216.51]) (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 6E2EF3DB335 for ; Mon, 14 Sep 2026 07:29:20 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.216.51 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1789370961; cv=none; b=N3nzf71mQHp979IZ4EpLkiacbsEGoh6gQXR+YuoXJPaU7QCGcZl0GtXtQAI9a79PER5XpmLfiSZ9AVnjBVHeja6X/Wll38rFLX5sQvpb+NQ+pKPQaCqr2fs7O/6/aTcBGSOafXUlRFmoKs3wIQrE5WOPUii0uEKINvVlWN3Aucw= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1789370961; c=relaxed/simple; bh=cIca475pFe2f5ZYvVKkisqa4yG3Dl/6iz7rvR/7MMYs=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=bh1FQ+Osk37YtcpOmSVlIedVDy6kfpvR4yBSMu76TOzjgIOVr2sRNsKLzcXxEEGjm4vXLY7nX8//4SAHqESBo2XaoVK2New3Dn65DL5NHbDyezjGjHg6XeUwrKe4gURgVUEUM3DsfT7nXbcl1Pp0XF6+/DYt2ndzqen1he8q4Rs= 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=gWfWKVcv; arc=none smtp.client-ip=209.85.216.51 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="gWfWKVcv" Received: by mail-pj1-f51.google.com with SMTP id 98e67ed59e1d1-3964e480f76so4090667a91.1 for ; Mon, 14 Sep 2026 00:29:20 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1789370960; x=1789975760; 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=B5j422sp7IgKzOpG0gt3MXA3l3kQYxqi7If+zAVtiI8=; b=gWfWKVcv1pRJFAtYkpiZiPR/A2g2knn9gzHPHFp1P1u1we10zuY9RnELEcXvAbH1aE 2eAue8QPtXACxmA5f2NV4vWWE+k6zAQPb0i1qv8Tp7cuIDG46/aYjQxbxu6Io1Ovu8mc 2IfvUc5UhK8YpKw0tmVpTV5kCNKGPUpfZtdy0HxChiuU0e66NkeM8JizfrP9SQPpB0Oh mBzVSXQ4+qIRR7a7ghfrHzcAFy+o57Ukd8jilWv9meJSKpRu8jeQ3eiOzVJOca8hnO1d dfYDmyD6NSeNrAljs/v6/p2bQv4ytD/StfW/NbPqRSzCUP9Uw4Us5XhbKWiCuzqMH9u7 qCxA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1789370960; x=1789975760; 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=B5j422sp7IgKzOpG0gt3MXA3l3kQYxqi7If+zAVtiI8=; b=XB/WwvkTxImt1sEoeeHbdAKQaP31XaK/ZpC9Jgfi1qcywGez2LQislkhvTQ8NMu142 moZmwEAd/yqHj0DHt9AI/tiAo7K77Fzhr0DVHRRemROwyKnDZE7MlFkB3C4WylASLTm3 tlXWqhCk7dpsBRInWpGxSZfXF22LKRMnh8PbdzVbQTZT8RHCLwDo3N76hCaXgcJWb+8d aT/CIt5+YFThkpIfn83nxabDUvX/4qxg2d+7HTPDXigRgIPVpKlo7zAPeJIZKb9XRCzh 8+S5JPgyXJGXycbGuuMUoaX1HZJwjHZjYeT9halNAJWa7sx/shRMxxypjiZX1J9iFdH7 HWsg== X-Forwarded-Encrypted: i=1; AKwUvBznYZD91WWQrxsBLg2Cwr3sNgkV2Ns1JKPNz99dzs46QFT3EESejeaDgpGlG3P+ViVn16CZLjVsgCX5cUw=@vger.kernel.org X-Gm-Message-State: AFuF++nT12NIYwujxnH/ZQi92bmN46znarjnJlfhSnf5dXfUe+rbP0BP xD1zI3XBDerw1gT+A6K4HQ5DIkGkALJ60WWdRhIFivFqGP0Fl4xRdUD4 X-Gm-Gg: AYBFou37hojuUdz6YIDQYcJOZMyyCpS7FGwDHe4WrWnwhrC0S73aAWWiVSQO44Y6XMQ 0F8hmLSqhTwGrQurHmUtcmAForVoMyk1cqztJrrAMLtkmxksx9vWSsjojvCwMXoV8auSRZRfodh WSMjeVKcNI8YN2+xfhbeHAHAdzpVxurXJI/03h0BsCavAGwycvC8bTR4GWMuElP+pkyFSr2bqFn c99m4jbeDPuE4NUUlgdkVKeMrc4/yGLYco5hJgTHw+Pm8/cMFOImUpC3wI8TLf/ZN3vEwRUb3uB pxzqSvNRo4Lk9WDmEPX3hFihiMoH0kt5+q/yHecZ9n33iYjnXfwhtLYrxGfxYKZXEb4PiGs7aOc 07uyNQU4XsC9JJp6gVSzTPMRVZ5zCeRzRrTSc5NRQFJu3b5Sc23hfm0dyEx3yOnSjqrMiYxOdsH EW5EUXnGep1BYb9yWiTzRnY/vU/h+ifxdt3Uqdh6RauRuw2/6bXgRaWVCf+0NpxPHThKKMFF8SI w3ChSdp1y/8LoAEZjaz+K5wsEz/VSXUKqDKqmoBpr5w7UDKZKisEgnumg4D8w2okhDKDzG6hLOZ 3oWuIKk4ccGbgys= X-Received: by 2002:a17:90b:4984:b0:39d:f61d:7ca6 with SMTP id 98e67ed59e1d1-39df61d7d1bmr9021a91.15.1789370959820; Mon, 14 Sep 2026 00:29:19 -0700 (PDT) Received: from phuc-desktop.. ([183.91.15.56]) by smtp.gmail.com with ESMTPSA id 98e67ed59e1d1-39d957131f9sm19598245a91.12.2026.09.14.00.29.16 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 14 Sep 2026 00:29:19 -0700 (PDT) From: phucduc.bui@gmail.com To: Mark Brown , AngeloGioacchino Del Regno Cc: Liam Girdwood , Matthias Brugger , Jaroslav Kysela , Takashi Iwai , Cezary Rojewski , Cyril Chao , Kuninori Morimoto , Dan Carpenter , cassiogabrielcontato@gmail.com, 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 v2 05/13] ASoC: mediatek: mt8189: Propagate reg_rw clock errors Date: Mon, 14 Sep 2026 14:28:34 +0700 Message-ID: <20260914072842.24420-6-phucduc.bui@gmail.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20260914072842.24420-1-phucduc.bui@gmail.com> References: <20260914072842.24420-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 mt8189_afe_enable_reg_rw_clk() currently ignores errors from clock enable and parent operations. Propagate these errors and clean up the clocks before returning the error. Fixes: dc637ffeed6c ("ASoC: mediatek: mt8189: support audio clock control") Signed-off-by: bui duc phuc --- Changes in v2: - Update the names of the goto labels. sound/soc/mediatek/mt8189/mt8189-afe-clk.c | 31 +++++++++++++++++----- 1 file changed, 25 insertions(+), 6 deletions(-) diff --git a/sound/soc/mediatek/mt8189/mt8189-afe-clk.c b/sound/soc/mediatek/mt8189/mt8189-afe-clk.c index 69aa3715c19e..173ee0709b16 100644 --- a/sound/soc/mediatek/mt8189/mt8189-afe-clk.c +++ b/sound/soc/mediatek/mt8189/mt8189-afe-clk.c @@ -700,17 +700,36 @@ int mt8189_mck_disable(struct mtk_base_afe *afe, int mck_id) int mt8189_afe_enable_reg_rw_clk(struct mtk_base_afe *afe) { struct mt8189_afe_private *afe_priv = afe->platform_priv; + int ret; /* bus clock for AFE internal access, like AFE SRAM */ - mt8189_afe_enable_clk(afe, afe_priv->clk[MT8189_CLK_TOP_MUX_AUDIOINTBUS]); - mt8189_afe_set_clk_parent(afe, afe_priv->clk[MT8189_CLK_TOP_MUX_AUDIOINTBUS], - afe_priv->clk[MT8189_CLK_TOP_CLK26M]); + ret = mt8189_afe_enable_clk(afe, afe_priv->clk[MT8189_CLK_TOP_MUX_AUDIOINTBUS]); + if (ret) + return ret; + + ret = mt8189_afe_set_clk_parent(afe, afe_priv->clk[MT8189_CLK_TOP_MUX_AUDIOINTBUS], + afe_priv->clk[MT8189_CLK_TOP_CLK26M]); + if (ret) + goto err_disable_audiointbus_clk; + /* enable audio clock source */ - mt8189_afe_enable_clk(afe, afe_priv->clk[MT8189_CLK_TOP_MUX_AUDIO_H]); - mt8189_afe_set_clk_parent(afe, afe_priv->clk[MT8189_CLK_TOP_MUX_AUDIO_H], - afe_priv->clk[MT8189_CLK_TOP_CLK26M]); + ret = mt8189_afe_enable_clk(afe, afe_priv->clk[MT8189_CLK_TOP_MUX_AUDIO_H]); + if (ret) + goto err_disable_audiointbus_clk; + + ret = mt8189_afe_set_clk_parent(afe, afe_priv->clk[MT8189_CLK_TOP_MUX_AUDIO_H], + afe_priv->clk[MT8189_CLK_TOP_CLK26M]); + if (ret) + goto err_disable_audio_h_clk; return 0; + +err_disable_audio_h_clk: + mt8189_afe_disable_clk(afe, afe_priv->clk[MT8189_CLK_TOP_MUX_AUDIO_H]); +err_disable_audiointbus_clk: + mt8189_afe_disable_clk(afe, afe_priv->clk[MT8189_CLK_TOP_MUX_AUDIOINTBUS]); + + return ret; } int mt8189_afe_disable_reg_rw_clk(struct mtk_base_afe *afe) -- 2.43.0