From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-pf1-f173.google.com (mail-pf1-f173.google.com [209.85.210.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 63BF641BA62 for ; Thu, 20 Aug 2026 11:13:40 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.210.173 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1787224421; cv=none; b=m/yW3DW/YF/Rs3X+819lgqcqHEMsqdtq+M7SKLb9FvSVGfV9T0LMpvBlrcOaZdpZsOe6JHpNGTYH58uHnlC+OPa4D2+bCQhlF72PTtXBb+fY8Mz9saKz0K9ctfowP86oHIgPvdKUKG2Kp37+dExtUjP0FLxcqgCa4fvLybZZxoY= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1787224421; c=relaxed/simple; bh=GZ+W8p1ry7vldsXpMatf0H+bFkmjz0Gihshg3tLwqpw=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=RRXfLbvNOh7ZQFDO5aX5nFwvxHpbSTh3MC8oTR1vNlwnCgkfUN+OMFIgykK1bD/jjwjJapK5VUQjdEdcrkq2MW9AhyZbd0Rcx9S64XV/r9wahWO89LCqoN9eKAzuq1F9Kr6li7THdKfBIKQE3UYbxLBZ/4mdTCrB1xPVFWjsAbU= 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=dtH3haA0; arc=none smtp.client-ip=209.85.210.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="dtH3haA0" Received: by mail-pf1-f173.google.com with SMTP id d2e1a72fcca58-84e0688b7e8so1584167b3a.1 for ; Thu, 20 Aug 2026 04:13:40 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1787224420; x=1787829220; 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=lJCRYDZE3VyQeQed1gNiTmBloNm9vN2iVU/zKNvs6Uk=; b=dtH3haA0tUTUff+CRnKhOYsxlISot5ZzpmI7UTZnRjXMlJAy0ATrZMUaHq/jnyECxj Fdl8X69kzOIJLsxs4DyawwTctCcwv5iNMiyOuGsOK7/+XCjpZaFwSYqCrGY2JXjjjyz/ iSrPKekfCXMcnDPG5bZxYJttq6r50OEPN4FoPmutN59tGvbsfUrlmZa3H1mvBW/nDh8m kc67VQYSFBiRL/nriE1+RH8UTJcvbLE0EEGwjwsoVVPHAd7zUY8KUt+T9MHC/e14qNQu 5rGMrXBtkL4zRvFY9OH/xtOuc68dhfmuDgOdvas0LgXwMmbPmkIr25W1radygXuZw5a4 Tf9g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1787224420; x=1787829220; 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=lJCRYDZE3VyQeQed1gNiTmBloNm9vN2iVU/zKNvs6Uk=; b=pqq6VVEE1IYD8FB1uFdSDkOuxE12qvjX/0iJeO6NYh9no0bief0cWfH4xmsLQTaiAz BIkm9NUGO4Vtah6ILrQBzurq4sjeJCHUm+QIOv4qp9JLAaI6LspwVni7Z9TMnC8AdmWJ XaobVqVfotTt53GD3TBbjJwDNgo0mMlJ8WZ/4nTa8Fz5kTmrVTpDADNmeLiCokHFpfyi MfoCliv4V5xXJYn9PXPWAxfuBg5W25DSs6pbzwHyVhqkMXg0wlO6+q9URc36ldoZaFit ZLa8AQTTVMJAV9VybBhhHEyuR71Bb/eDFxGKG3sTJ6/qsq2dn0SzfZY1JRKw4mQ3xarL d8Sg== X-Forwarded-Encrypted: i=1; AHgh+RqAtPSYbj4hJmeNIcb/2KpOggjLCrFG3X2xegcUqjUT8uRhR40xMoANytdhipJQ8QNHR9LT9acWAceEe2A=@vger.kernel.org X-Gm-Message-State: AOJu0YwynnF4yWFOQmiNk4JjalJNPncMy4L6cdd1lWg6C4zRUippXxMV p4TKH/IyuwXiTIDHoIm3dXCMsqfaadVlI7eKNbR7keHWPkumS6hzTUwy X-Gm-Gg: AR+sD10+nAUvVGcXaKJq+aftVHuIPpid3r5pk8mq5zYzwn3d9QBti/TNhtD3kkcmE/V 6HtBieknez00JB5OnkQPbK+K+YEwCZ7Siq5mCpFnkYJNHtThkR+W7qizyCh/617qsjHw36l3AQ1 ipK7pV6NOk65sSIgYLZIbGnftcwicDlk/W01FtdhDRZF/e/k8SCY1X2x1DpqNcLkE9Wsb3/dev0 ENM7jrgCkjG+R2YAVzwlzPAGxPS9QGKamnvLUtEmaUsS0r2sT9HKSqqyrjaUg6WxsfK6GqFzfbw RT+NFCYcc2om+PivABcSj/Z1ErSTWyBXOiTrfBgZnJt+IAOox4v6xKHA3GMg26mU0mQ+O0F35B6 J5ruAAnpbWA0VSol2fRSmD+SvX7sgIDg4YZfimHumDzHWtL9uW6ol0dgOWgV4MQJO3sPd6uiXVa qtwHFQj+WA1tvHrMKPW/D79civsJ8KJgSslZREAVsXvOK5XqWQ0PRVV9UcciX+utDJNGrqNt5Qk JTlYa0oKoGRqgwkPL8Q49BwWbzV+5BashA0I9VY8wtwuD1V13fbA05TqdY5GS/RoqzwRTd3uWmT VKJRqaOdcWZrlwA= X-Received: by 2002:a05:6a00:148a:b0:845:cdc1:a803 with SMTP id d2e1a72fcca58-851d3914f9bmr20061259b3a.11.1787224419796; Thu, 20 Aug 2026 04:13:39 -0700 (PDT) Received: from phuc-desktop.. ([183.91.15.56]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-851d36185c8sm1515460b3a.38.2026.08.20.04.13.36 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 20 Aug 2026 04:13:39 -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 3/5] ASoC: mediatek: mt8186: Fix APLL enable error handling Date: Thu, 20 Aug 2026 18:12:51 +0700 Message-ID: <20260820111253.97866-4-phucduc.bui@gmail.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20260820111253.97866-1-phucduc.bui@gmail.com> References: <20260820111253.97866-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. 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