From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-pg1-f173.google.com (mail-pg1-f173.google.com [209.85.215.173]) (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 25CA73E834D for ; Wed, 19 Aug 2026 10:19:07 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.215.173 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1787134749; cv=none; b=EZA9qD9JSmVIe7+Sfyo1DDTkhEQsuzib9e5T96+2RPFI0FKIxHk3KodwxXN6MbvPbjSga3wWfwMnCktE970h6bOobbstlRWbzIfyzBG7Z6FgsAl8fkqUBfTHdgpT2g2h1GNZSEVGOrN0V4MV/QwiScotUawWPMu9nwLJNfK7Ifs= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1787134749; c=relaxed/simple; bh=38a4v99US+t86JR6CIAMcsPAF66ohTi7Rvi/M5i7M74=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=dGnk9WZ3f4FDet51Q7C9Q+ypunivwRBvm/K0XvBpdd4kh+b+dRu9qFUd29rWtSJ2vDnAvCvpHxMdma+xB4pyARdc4YzmuMSJw2lnCWvxookvXKsj7OsHmS7/YkPTEwkq87xP+8B6oEv+4cfBOVbrWqoFeYCPwZUqR9UEOA8TE9A= 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=IAjG4ZlF; arc=none smtp.client-ip=209.85.215.173 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="IAjG4ZlF" Received: by mail-pg1-f173.google.com with SMTP id 41be03b00d2f7-ca88130e09aso419582a12.3 for ; Wed, 19 Aug 2026 03:19:07 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1787134747; x=1787739547; 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=IXqFLwJuyV+JjqMhVzWBsHgdtBjtcPrrFop7DOTcoKs=; b=IAjG4ZlFd3TzPsK/C1YjdASrOuof2QomIdLGXr5ba8eFRqxrKYk7/Cj814iibXMHPf fntBr50ai4kaCuqA8Wl6U6Hpskrmapz4geOuGlWTRZGQhlslq7JdL3YMiCiGUeuxa6NJ ZT+Q9wNXOltpmv8dWWTUJjczBZY1QH7l7RX308WtSd/ljh2DpJ+TzKwOkLBvB8pwX1G4 B+1G0zyJ4/8/8/HPGOEh6zOOQc7h2JmdZUmQR2y+fgLVasWT7fn0sHrzj4W7CsJzSelF 2gKDZpMmm+YhUOdaH73W1cYaUux6hg/6Gjao8SxFHdYKiAOpf52vKBY7kILGMQrngzTN 5W4w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1787134747; x=1787739547; 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=IXqFLwJuyV+JjqMhVzWBsHgdtBjtcPrrFop7DOTcoKs=; b=l7maaJrkx0TjdjADUdy5eDnOxPWrYDKkWz7Kr7WNNk7hu5rI6sidqiQSYby05GRO+e wi0/tJfmKUMAKZxmc1OPhdDc9m13ddbc0g6XlrI2xfdFo0pv7EBPKWuSAh7vmhZ0Uxoo NCSwxc+9tt20av0QagtiMLgIl0XRTOWu8GvvRQIwnyA4DHg/ryNuSUblDBwouymuBt8F TwvI0yqh/JUe33jT37CpbmeC1XD7a3Vb+lGs2BF4q/bOEmcAgAQYzr3CI/xr08LvyIfr mqC2RKdL9qwFwnpFhgCCpLSUihQXc2jkNIMzSBfX4fyVAT01N0yR7EppuwUteutp/Nyy 3UNg== X-Forwarded-Encrypted: i=1; AHgh+RoMrBUHJy8snOVXl+p0qfwFKTwObAvBLYteXwF06uzgUh3tliSi6RGJTRONcQlKW4e448BOMD/Z9rHLR5k=@vger.kernel.org X-Gm-Message-State: AFuF++kTYbJj5N0bZ10k35ag2cdhW1CdEKavo0T0k0J57CPn6wbt1HZJ GQx3TwQP0yTFPsduD/REadLOf7yvhOldck2AYSY31PN2pChMcr7ybP20 X-Gm-Gg: AR+sD11O+m95mQ+m5nTZOPvRhdnJq6LMXTBpRG3GRBOBslDVHDGYYFtZR7zUMqIpPbI ax3M0bjnTDMZfuRQVHtLxBfmc9xkH69g5Wh3JqQufSfz4PeapS2Lq+bhnEFSJg9PFfY1uI0T0Qp xlxPciVAABKmJg3hNDlrLH4tZnjnzsDsXT0Njb/eUzobGj9CzHFKLo2jcPMJNDsKxEmliYX4GBF D2CcVD953cUGUB+81CLrRSX4ixC08nf9+mzk5TrTN5TKMFV17Eqeog5vbE4Fif+nSKsYGy5ze51 EqveaVJOUlO/MYeDKCmzWEBpmrA923/CUkQyuOs7DAro9tCAQl8CZDq5X4tjJCJJ8IPn6oQO2IW YVi9/xNLzc6xRFsaqu8bEJSVePDPqrOS7xGxQOVRNu3OYxjYgDeKaT6OmijzDWThccQpWp7QYsU BCb1ikkro46NhRpSTylcRasdo/MIHdbSCDJImO/UdZIzcTVxaLxLjWd4y7+wS5RHlhhURMIifSg n0D9s/wi02nFeNjuhdAilLWyGHbT1jq8yv8/IeoFbee8zbqiDc9HXwDfutRZ2x4nTw1N+jlIIxt kYDa X-Received: by 2002:a17:90a:f94f:b0:37f:fdc8:71b4 with SMTP id 98e67ed59e1d1-39580840397mr7076830a91.2.1787134747355; Wed, 19 Aug 2026 03:19:07 -0700 (PDT) Received: from phuc-desktop.. ([183.91.15.56]) by smtp.gmail.com with ESMTPSA id 98e67ed59e1d1-3957fb14bbfsm2146392a91.1.2026.08.19.03.19.04 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 19 Aug 2026 03:19:07 -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 2/4] ASoC: mediatek: mt8183: Fix APLL enable error handling Date: Wed, 19 Aug 2026 17:18:47 +0700 Message-ID: <20260819101849.68010-2-phucduc.bui@gmail.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20260819101849.68010-1-phucduc.bui@gmail.com> References: <20260819101849.68010-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 mt8183_apll*_enable() functions call mux_setting(afe, true) but do not check its return value to handle failures. In addition, the cleanup paths of mt8183_apll*_enable() do not call mux_setting(afe, false) when the enable operation fails, while the mt8183_apll*_disable() functions do. Add error handling for apll*_mux_setting() and call mux_setting(afe, false) in the cleanup paths when mt8183_apll*_enable() fails. Signed-off-by: bui duc phuc --- sound/soc/mediatek/mt8183/mt8183-afe-clk.c | 18 ++++++++++++++++-- 1 file changed, 16 insertions(+), 2 deletions(-) diff --git a/sound/soc/mediatek/mt8183/mt8183-afe-clk.c b/sound/soc/mediatek/mt8183/mt8183-afe-clk.c index 6ab0734ad136..260c27016cc0 100644 --- a/sound/soc/mediatek/mt8183/mt8183-afe-clk.c +++ b/sound/soc/mediatek/mt8183/mt8183-afe-clk.c @@ -382,7 +382,12 @@ int mt8183_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) { + dev_err(afe->dev, "%s apll1_mux_setting fail %d\n", + __func__, ret); + goto ERR_APLL1_MUX_SETTING; + } ret = clk_prepare_enable(afe_priv->clk[CLK_APLL22M]); if (ret) { @@ -411,6 +416,8 @@ int mt8183_apll1_enable(struct mtk_base_afe *afe) ERR_CLK_APLL1_TUNER: clk_disable_unprepare(afe_priv->clk[CLK_APLL22M]); ERR_CLK_APLL22M: + apll1_mux_setting(afe, false); +ERR_APLL1_MUX_SETTING: return ret; } @@ -436,7 +443,12 @@ int mt8183_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) { + dev_err(afe->dev, "%s apll2_mux_setting fail %d\n", + __func__, ret); + goto ERR_APLL2_MUX_SETTING; + } ret = clk_prepare_enable(afe_priv->clk[CLK_APLL24M]); if (ret) { @@ -465,6 +477,8 @@ int mt8183_apll2_enable(struct mtk_base_afe *afe) ERR_CLK_APLL2_TUNER: clk_disable_unprepare(afe_priv->clk[CLK_APLL24M]); ERR_CLK_APLL24M: + apll2_mux_setting(afe, false); +ERR_APLL2_MUX_SETTING: return ret; } -- 2.43.0