Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.remote-ip=100.103.45.18 ARC-Seal: i=1; d=subspace.kernel.org; s=arc20261015; a=rsa-sha256; cv=none; t=1795055390; b=0jkYiFGzWk26NYkbwXzxUCyTGDSLn80PsqtQX5eL3kBJvHGRpU6u1l4C/jZwf2EIlKcY 0ZFcdl+tB0fqxKzJGcvcJxsQjXzBqRxf1QRqDmBdf3Hg9Spht36Y9SIgXOE8uD6nmp195 Cnk0Ippfu6ON24llYiwzpemAUM8WMyJVfruovicvk0PXUIJgnRo4hjlxPryOh/cd+YZw4 AhGSeh5IYX2Gse6a3YrXQVS0RlEGdLIqqHjN+mFSK/c7Naw51THKdDZnw2CApM398vL+m E3jLVrC1jJyj3v5HTpW5rbTYdvuaH5Qwx3P17ml16pB09MGz5Y9zN+mO5QlHrZcMxKg== ARC-Message-Signature: i=1; d=subspace.kernel.org; s=arc20261015; a=rsa-sha256; c=relaxed/relaxed; t=1795055390; h=Received:DKIM-Signature:From:To:Cc:Subject:Date:Message-ID:X-Mailer: In-Reply-To:References:User-Agent:X-stable:X-Patchwork-Hint: MIME-Version:Content-Transfer-Encoding; bh=lz2ceMOxC4CqymC8AB/mvqSDh6L0fcaA7Gk/dLsOx/A=; b=DQdXWI+ezWWX9iarkEeY3yPM490Goyp+6Wg/Wqto6rgfJnzfw+ltbn92nMz0FB5s/tsj hYOxIoQJMGsWu4pbRJqQ7kUf28gYec2WIGGVNLVpPIXwpA+MSSXtMR9gdHYh7NNQ7uCMg 7iRHMrwHW9JrfY+v5Z4DfjhJOCHzJ9KfNU01B4sKqSSkIZZ3B+awN8dRPFdsXkdEGvVIf r8DNQA1c+tXdrIy4EutdLchatdgqzO1SApiIHe0hOp2CmFsfOk/VjPcksXbPqcLz+cPee BEgVzAGvegLdkkGLhNUirHMF9N8JYHgLkmCQZfreXNYp/CXWAsNc85GvhscSu0Z8iww== ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass header.d=linuxfoundation.org header.i=@linuxfoundation.org header.a=rsa-sha256 header.s=korg header.b=0c0rAVQo; arc=none smtp.remote-ip=100.103.45.18 Received: from smtp.kernel.org (quasi.space.kernel.org [100.103.45.18]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (prime256v1)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 9131B606A332; Thu, 19 Nov 2026 02:29:50 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.a=rsa-sha256 header.s=korg header.b=0c0rAVQo Received: by smtp.kernel.org (Postfix) with ESMTPSA id EA7571F000C5; Thu, 19 Nov 2026 02:29:49 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linuxfoundation.org; s=korg; t=1795055390; bh=lz2ceMOxC4CqymC8AB/mvqSDh6L0fcaA7Gk/dLsOx/A=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=0c0rAVQo5M8GliMNkmZAqx5lVsW3D/zxhwgEh4IrBgBjhHX3kFy/JN8X5mDYUDEw/ Gz1SFy4YbpzICyc/1GeoW0XMsi7MDj3FpHjiyK/JleVXDgwCJAIxE5d7U6ZF47n2Y0 yf9j5yg6jc2Deu3/sXndmT1vfl/M7u10o825Ongw= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Cezary Rojewski , bui duc phuc , Mark Brown , Sasha Levin Subject: [PATCH 5.15 1614/2214] ASoC: mediatek: mt8183: Fix clock handling in mux disable path Date: Wed, 18 Nov 2026 15:54:50 +0100 Message-ID: <20261118150116.559878927@linuxfoundation.org> X-Mailer: git-send-email 2.56.0 In-Reply-To: <20261118150009.797899913@linuxfoundation.org> References: <20261118150009.797899913@linuxfoundation.org> User-Agent: quilt/0.69 X-stable: review X-Patchwork-Hint: ignore X-Mailing-List: patches@lists.linux.dev List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 5.15-stable review patch. If anyone has any objections, please let me know. ------------------ From: bui duc phuc [ Upstream commit 4a0f9566ae0c3ad32620254342b266f37f4757de ] In the disable path of the appl*_mux_setting() functions, clk_disable_unprepare() is called after clk_set_parent(). If clk_set_parent() fails, clk_disable_unprepare() is skipped, potentially leaving one of the clocks enabled. Remove the goto exit paths so that all teardown steps are attempted and any errors are only reported. Fixes: a94aec035a12 ("ASoC: mediatek: mt8183: add platform driver") Suggested-by: Cezary Rojewski Signed-off-by: bui duc phuc Reviewed-by: Cezary Rojewski Link: https://patch.msgid.link/20260903045203.175337-3-phucduc.bui@gmail.com Signed-off-by: Mark Brown Signed-off-by: Sasha Levin --- sound/soc/mediatek/mt8183/mt8183-afe-clk.c | 6 ------ 1 file changed, 6 deletions(-) diff --git a/sound/soc/mediatek/mt8183/mt8183-afe-clk.c b/sound/soc/mediatek/mt8183/mt8183-afe-clk.c index 6ab0734ad1365..dd1a5925af96d 100644 --- a/sound/soc/mediatek/mt8183/mt8183-afe-clk.c +++ b/sound/soc/mediatek/mt8183/mt8183-afe-clk.c @@ -271,7 +271,6 @@ static int apll1_mux_setting(struct mtk_base_afe *afe, bool enable) dev_err(afe->dev, "%s clk_set_parent %s-%s fail %d\n", __func__, aud_clks[CLK_TOP_MUX_AUD_ENG1], aud_clks[CLK_CLK26M], ret); - goto EXIT; } clk_disable_unprepare(afe_priv->clk[CLK_TOP_MUX_AUD_ENG1]); @@ -281,7 +280,6 @@ static int apll1_mux_setting(struct mtk_base_afe *afe, bool enable) dev_err(afe->dev, "%s clk_set_parent %s-%s fail %d\n", __func__, aud_clks[CLK_TOP_MUX_AUD_1], aud_clks[CLK_CLK26M], ret); - goto EXIT; } clk_disable_unprepare(afe_priv->clk[CLK_TOP_MUX_AUD_1]); } @@ -298,7 +296,6 @@ static int apll1_mux_setting(struct mtk_base_afe *afe, bool enable) afe_priv->clk[CLK_CLK26M]); clk_disable_unprepare(afe_priv->clk[CLK_TOP_MUX_AUD_1]); ERR_ENABLE_CLK_TOP_MUX_AUD_1: -EXIT: return ret; } @@ -345,7 +342,6 @@ static int apll2_mux_setting(struct mtk_base_afe *afe, bool enable) dev_err(afe->dev, "%s clk_set_parent %s-%s fail %d\n", __func__, aud_clks[CLK_TOP_MUX_AUD_ENG2], aud_clks[CLK_CLK26M], ret); - goto EXIT; } clk_disable_unprepare(afe_priv->clk[CLK_TOP_MUX_AUD_ENG2]); @@ -355,7 +351,6 @@ static int apll2_mux_setting(struct mtk_base_afe *afe, bool enable) dev_err(afe->dev, "%s clk_set_parent %s-%s fail %d\n", __func__, aud_clks[CLK_TOP_MUX_AUD_2], aud_clks[CLK_CLK26M], ret); - goto EXIT; } clk_disable_unprepare(afe_priv->clk[CLK_TOP_MUX_AUD_2]); } @@ -372,7 +367,6 @@ static int apll2_mux_setting(struct mtk_base_afe *afe, bool enable) afe_priv->clk[CLK_CLK26M]); clk_disable_unprepare(afe_priv->clk[CLK_TOP_MUX_AUD_2]); ERR_ENABLE_CLK_TOP_MUX_AUD_2: -EXIT: return ret; } -- 2.53.0