From mboxrd@z Thu Jan 1 00:00:00 1970 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=1795024500; b=rBtEQKZoyw9w1bbZOyyGLNQIlCOMasTY4db11Kdy0WXx/wc69o5pAJ5SGhRI2aCeK8Km m+QImZLvl60OAfbxvuVKGLBXozhYmiLx1yrD1rmbixjxSzbxrG4R6olX3W3u+j8V20kFi vPMVGDsYqvSCQsnaP2HEmxZZnPwW1n86/ZoPupnOQdY+4a6lcHV5weDwAPMrWp/n7JWR0 lePuzZLt7PaNSXgZMz9AGKL1wp8Y/5vEagAyUsHEXAqjsoulES1yhHugOMHd0duP9oRc6 hXz9XxAkWmIztlAllH5Q+5OLlL/5o16GHiPOzVpAHT/xEcvHGfCK3PLB4CLVWlKTbag== ARC-Message-Signature: i=1; d=subspace.kernel.org; s=arc20261015; a=rsa-sha256; c=relaxed/relaxed; t=1795024500; 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=iiutSBeeX4cQKUuy4wJSyFM0XxVyxGrlMmyl/nF9V/U=; b=BV+BJqQzyipgUavBwiIMuMYQ2VcIAxFcWjiW5PkI7UMwt6mMEhibKn2F9zOT5GL5k/N1 BjL04R1hc/g/CApYV8wO3znD57K+Dy91S6enP6nvT6JMgCdR5InSg549ShHvB/ac9m6ag oJcyrRi566P6CBUR43RIXWT3JlT6zVDCvb/zZnyq3CdvUJqBUecEmhgriaQ4FWNZMkx4v 9GAXepeDvwEqRhujrIdTYVE0p6vkJAabP0C5JPbviHG+dLfMLq9m7MsrwlK6blvpGtKhX lIHRZnHWmubxlLXZJsIusJ9Eipb6DDcBMivSv49hH9e/HJt4MhpnVtq1qpv+6ML1mLQ== 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=VXYc0Nck; 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 7992F606A32C; Wed, 18 Nov 2026 17:55:00 +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=VXYc0Nck Received: by smtp.kernel.org (Postfix) with ESMTPSA id 867E61F000C4; Wed, 18 Nov 2026 17:54:59 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linuxfoundation.org; s=korg; t=1795024500; bh=iiutSBeeX4cQKUuy4wJSyFM0XxVyxGrlMmyl/nF9V/U=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=VXYc0NckOoBHUNCcrd6Y+kSqSwmzPLwvN/TT/F/1tHkFOdQjY3q229hNyTTPWfHpK LEeqo+fBgyEgAvFGr7C/EEiReszZd5Tb/TN8BjPpcNrvvvK54TR9RLoi+hwQiV0gfE acSbWkOdYlQnzRXaqjPycnfLY0h0juTFlS2PezHU= 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 6.18 0748/2151] ASoC: mediatek: mt8183: Fix clock handling in mux disable path Date: Wed, 18 Nov 2026 15:41:23 +0100 Message-ID: <20261118150149.272815051@linuxfoundation.org> X-Mailer: git-send-email 2.56.0 In-Reply-To: <20261118150121.603863898@linuxfoundation.org> References: <20261118150121.603863898@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 6.18-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