From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-pl1-f172.google.com (mail-pl1-f172.google.com [209.85.214.172]) (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 8B0BC47668E for ; Fri, 21 Aug 2026 12:31:06 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.214.172 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1787315467; cv=none; b=OyAPkW4VrsgMd82QuObIkemx95FPD2wFJ+LVFitWWyzEM0zpLLWBOFf+7M61kH8sa2wwquRtK9H8usNVD2DKWGU3kTMcMSE9TJUX2auKr9zlfiSv5qKTRScdrA12Vf65j9GABrLU1utwUurYuNq2mrA71HJYP3eNCVkUl1x44xc= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1787315467; c=relaxed/simple; bh=t72dr0cwfbwJ9VAdoQJMcgZwLqXIztHpdw9rz+BPXpY=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=dx+oiQb1g6pt01/G40GR5+/j/rMs97ksyYytwBbFhs6zdexGwkwaZJIPny0Q1OJNVk7xBGHVCaTNKF0uUmzEfJ8tyf3+w0gJs0m3nxPvPbKs03mbO7j2Z0qQ6Zomm+Nk0PplJylZKZRrVOD2k5/jxakzrBJUkpLUICVeGuxqVrI= 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=Od1juvEf; arc=none smtp.client-ip=209.85.214.172 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="Od1juvEf" Received: by mail-pl1-f172.google.com with SMTP id d9443c01a7336-2cf50c6f235so11620485ad.0 for ; Fri, 21 Aug 2026 05:31:06 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1787315466; x=1787920266; 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=gGl1wn1tthVVpzXm7BgSd3YBH4Pka/KCiti4HDh7cGM=; b=Od1juvEfwmEtI4cZUzUrnK6l+YbuUO23CvQMS1JG6PBz1e7gyRaLMe4wHYSqC1h5gb VYyxf7R2gYuFdbrl7d8DBdz5vyEZbMz/RRPi5itjJJOFZ0YAK3GbBbDeVy0uPdXH+uv6 P5e7XHF9fV8oxs3lhkr0+OysB9mX2xAvr0vIIg2lmePdubpiSTF7D8D0GBYpGcgJm2SI MA6ZjbSdnpWP8lmSWT7nvWMgEusFfA6W5be4qL8Ha7K2J4YTjCsMoy+v2y2Vyv6pUNuM OdJeo2VaJGE1o4uEcGF30FVlghnaOZWhGbgf5xMdvTOIp8Hqo8mwAZWz5TG+TUh6cBOU EUDA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1787315466; x=1787920266; 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=gGl1wn1tthVVpzXm7BgSd3YBH4Pka/KCiti4HDh7cGM=; b=RcBlKrB8ieyGwmrV1MqUt6xbdhRz7/8vyC79pHvtntHZbVrayASyMHDn/CIapQSvO9 Ur26mJ0gWJbwdn+larN+8rERbDRZAEm3O6ZOzpdhpm66+3r5Ydn32WpJ4CURl8agxgib jcskaaw0Qp+s8ZhS2rNmjW7/aS1v3ISN8nu7cycxVuUgMjfTqKRSqn2GGoCDyZ1ccBHR VPEDHc2Xy6Ibwq+B2JcOEM7kKNgKuSf2TtpPsHp/E0Y2eJF7+H+Uk9s514xkIrOklbE1 K1y1cLn1taw7xFHfevvQM5PLmqPNnX3gYcHW/OOKAUxj9GD7e/FuL9vojKmxkFwIg5PY bpMQ== X-Forwarded-Encrypted: i=1; AHgh+Rp1n6+kBhX8FeGBaTcjwwvpxep0p5bnstEhBNlASomyJ350Z4CwzYBOhc3FlwKrzFgXNY4KZGdSdbMQ0F8=@vger.kernel.org X-Gm-Message-State: AFuF++nUdj+6uCVI9fh6PtOkmXbICIgr3lAK5CqC14xa+J0NMtkk0UAg GxK4sEV62ai++6n6Ua3KhTq70MzLMXzrkVp8kaNIb/ug4FNtrhpm0RYE X-Gm-Gg: AR+sD11E9Qg2QPYAAOr60xjJbyyfY3Q0HNNiCYjLS4NOfVVfEOHMalnBE50XGV/HroV XinjdHeltSp7pHj+8Kjgv7c3lEzOjXwUcUWEsKdV+dNxIT+jXdIhChBKxwq4PYDnrouu2mP7ur4 pn9KrMHvJqdcVu2+GxbK5CpsSB3RGqJqH3o7NquRIrFWEW9yE+qVfKUVDLIEFMCpHWz2owvH9qn q75Dts0gCTBF9SfoGGEulAVEAYEjR+FkhiRe/50V4nVtQL4CUCgST/JMkveZ+Xu4mqdiLX7uFRB 4aZgps/xemuml2GLhRktonlaZJSZq2ruQUzeA9/lhzUn1T76NE3INeFxi/uHYQRmFEaHecuPD9P g2LJHmFpgYyNJLujix9i3EO61+5wka9rcEnECKJXat6aleBtxZL399vTWoHqnHIbUiWguK8ycvD QbyD0q3QroG4rFG7FsBN+K7g2SyrRMol477p5at7jMz6Z5JD9vPZg50AkkL8iObiMOt/7Jje06a towQ//p9ct1pyIBw2Kj9BxLjqAPEtRRPZ3Zxnv31H52BjE5ugEe44y+LAP3Iz2GhNlnylV38FHa qJX+ X-Received: by 2002:a17:903:3546:b0:2c7:f2c6:89e0 with SMTP id d9443c01a7336-2d64adf3b42mr124052375ad.4.1787315450332; Fri, 21 Aug 2026 05:30:50 -0700 (PDT) Received: from phuc-desktop.. ([183.91.15.56]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-2d62e36e1besm18302235ad.53.2026.08.21.05.30.47 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 21 Aug 2026 05:30:50 -0700 (PDT) From: phucduc.bui@gmail.com To: Mark Brown , Matthias Brugger Cc: Liam Girdwood , AngeloGioacchino Del Regno , Jaroslav Kysela , Takashi Iwai , Cezary Rojewski , 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 3/4] ASoC: mediatek: mt8186: Fix APLL enable error handling Date: Fri, 21 Aug 2026 19:30:20 +0700 Message-ID: <20260821123021.41390-4-phucduc.bui@gmail.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20260821123021.41390-1-phucduc.bui@gmail.com> References: <20260821123021.41390-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 Currently, the mt8186_apll*_enable() functions call mux_setting(afe, true) but do not check its return value to handle failures. In addition, the cleanup paths of mt8186_apll*_enable() do not call mux_setting(afe, false) when the enable operation fails, while the mt8186_apll*_disable() functions do. Add error handling for apll*_mux_setting() and call mux_setting(afe, false) in the cleanup paths when mt8186_apll*_enable() fails. Fixes: 55b423d5623c ("ASoC: mediatek: mt8186: support audio clock control in platform driver") Signed-off-by: bui duc phuc --- sound/soc/mediatek/mt8186/mt8186-afe-clk.c | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-) diff --git a/sound/soc/mediatek/mt8186/mt8186-afe-clk.c b/sound/soc/mediatek/mt8186/mt8186-afe-clk.c index 94bcaf92e396..d6b0174e2655 100644 --- a/sound/soc/mediatek/mt8186/mt8186-afe-clk.c +++ b/sound/soc/mediatek/mt8186/mt8186-afe-clk.c @@ -359,7 +359,9 @@ int mt8186_apll1_enable(struct mtk_base_afe *afe) int ret; /* setting for APLL */ - apll1_mux_setting(afe, true); + ret = apll1_mux_setting(afe, true); + if (ret) + goto err_apll1_mux_setting; ret = clk_prepare_enable(afe_priv->clk[CLK_APLL22M]); if (ret) { @@ -384,9 +386,10 @@ int mt8186_apll1_enable(struct mtk_base_afe *afe) return 0; err_clk_apll1_tuner: - clk_disable_unprepare(afe_priv->clk[CLK_APLL1_TUNER]); + clk_disable_unprepare(afe_priv->clk[CLK_APLL22M]); err_clk_apll22m: - clk_disable_unprepare(afe_priv->clk[CLK_APLL22M]); + apll1_mux_setting(afe, false); +err_apll1_mux_setting: return ret; } @@ -412,7 +415,9 @@ int mt8186_apll2_enable(struct mtk_base_afe *afe) int ret; /* setting for APLL */ - apll2_mux_setting(afe, true); + ret = apll2_mux_setting(afe, true); + if (ret) + goto err_apll2_mux_setting; ret = clk_prepare_enable(afe_priv->clk[CLK_APLL24M]); if (ret) { @@ -437,9 +442,10 @@ int mt8186_apll2_enable(struct mtk_base_afe *afe) return 0; err_clk_apll2_tuner: - clk_disable_unprepare(afe_priv->clk[CLK_APLL2_TUNER]); + clk_disable_unprepare(afe_priv->clk[CLK_APLL24M]); err_clk_apll24m: - clk_disable_unprepare(afe_priv->clk[CLK_APLL24M]); + apll2_mux_setting(afe, false); +err_apll2_mux_setting: return ret; } -- 2.43.0