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=1795023193; b=f/PqhTPbNW+hxD5vo12AFIC7RgfCoN9o2ErfFcCDJK5awTwQnWjkIoHGJx05B0Y0WpQS thUkXx0mQZ66sRiKVg25g/Bk0B7pseRzg9UlkCL4vyZwz3hHxaRlPVZ/cMOnQ06B3C2pE 84TXGGLQKRemtuM55tfw0bqfuHrZd7uPCKmqk37gA4TdkdIFC78Vog954HEMaUVZ4uT51 WEpLizog5vmD/++bUoOk6TL59Y2Z3757Msilg4+KbmxIGB3V7S+Fw9hFnfZ8y+HTGVzoC Y9C264EFSdWhBfUlmFLjMXe/9to1/TeimGZVHXxLBZCllVN2FFgvvYFQpJB+Rxmoc2g== ARC-Message-Signature: i=1; d=subspace.kernel.org; s=arc20261015; a=rsa-sha256; c=relaxed/relaxed; t=1795023193; 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=4h+Ddt0rDQmM9d10H9OxPdg8H1Ss59hba7btH7KazsM=; b=2PrR5U91Q0XYJKMIKlH1gjAfykGesyZtdIbf84jcj8+zaCspwsYsB/KyTNCAlDLHnVJn 9ApFeLAVPDIVhAVVU6kBVWN6Fm/Ujca3oB3hnHOkqpjqeh6YyCHRffG91tX1Il4GIgZgD ZTWV98GV4zPJ9oXPsGk+FrgUSGGPK3XNDEUhmfFvjiQfTAzDzka78n2IFOw7phlQIWwol wt9Qzu9dt+H7d7iXLi3UZuYBkhi1sLTD2W6ACpYxMyILOwkz5BVKX//96kjfbUYYZKB9y HzsxBgMl7p1aEmvvSpggq9dQ2GSvxtqoYBclaZH0Xqy2eG5UD0gvOdFWLiKy/Ef3Pmw== 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="m6Y/LIYI"; 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 E4187606A330; Wed, 18 Nov 2026 17:33:12 +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=m6Y/LIYI Received: by smtp.kernel.org (Postfix) with ESMTPSA id 4650A1F000C4; Wed, 18 Nov 2026 17:33:12 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linuxfoundation.org; s=korg; t=1795023192; bh=4h+Ddt0rDQmM9d10H9OxPdg8H1Ss59hba7btH7KazsM=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=m6Y/LIYI/A4FD/Xgk/xUzREpIQGm9Est/4iEFG1vp2aCKkt+VvWEOtDxN8sxmPjYR 8Bq38QG2RNQoIti64THw6TIaLKBEtgA0iN2smpeRhr1RybrtcmEaOk9WrBk9tABXyg im9YKpwH9knnYjE6i+VHKfLw9WnoWn1rgQBSK3+0= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, bui duc phuc , Mark Brown , Sasha Levin Subject: [PATCH 6.18 0280/2151] ASoC: mediatek: mt8186: Fix AFE clock error handling Date: Wed, 18 Nov 2026 15:33:35 +0100 Message-ID: <20261118150132.081145121@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: stable@vger.kernel.org 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 eb72060a1966baf9a6ed753186621ee6e39dc889 ] The error paths in mt8186_afe_enable_clock() do not consistently undo the clock operations performed before an error. Fix the goto targets and cleanup order so that the audio internal bus parent is restored to CLK26M and all previously enabled clocks are disabled before returning the error. Fixes: 55b423d5623c ("ASoC: mediatek: mt8186: support audio clock control in platform driver") Signed-off-by: bui duc phuc Link: https://patch.msgid.link/20260903051150.178057-4-phucduc.bui@gmail.com Signed-off-by: Mark Brown Signed-off-by: Sasha Levin --- sound/soc/mediatek/mt8186/mt8186-afe-clk.c | 18 ++++++++---------- 1 file changed, 8 insertions(+), 10 deletions(-) diff --git a/sound/soc/mediatek/mt8186/mt8186-afe-clk.c b/sound/soc/mediatek/mt8186/mt8186-afe-clk.c index 3edd0dd20eed0..685dc27c77807 100644 --- a/sound/soc/mediatek/mt8186/mt8186-afe-clk.c +++ b/sound/soc/mediatek/mt8186/mt8186-afe-clk.c @@ -288,7 +288,7 @@ int mt8186_afe_enable_clock(struct mtk_base_afe *afe) dev_err(afe->dev, "%s clk_set_parent %s-%s fail %d\n", __func__, aud_clks[CLK_MUX_AUDIO], aud_clks[CLK_CLK26M], ret); - goto clk_mux_audio_err; + goto clk_mux_audio_intbus_err; } ret = clk_prepare_enable(afe_priv->clk[CLK_MUX_AUDIOINTBUS]); @@ -315,24 +315,22 @@ int mt8186_afe_enable_clock(struct mtk_base_afe *afe) if (ret) { dev_err(afe->dev, "%s clk_prepare_enable %s fail %d\n", __func__, aud_clks[CLK_AFE], ret); - goto clk_afe_err; + goto clk_mux_audio_h_parent_err; } return 0; -clk_afe_err: - clk_disable_unprepare(afe_priv->clk[CLK_AFE]); clk_mux_audio_h_parent_err: -clk_mux_audio_intbus_parent_err: mt8186_set_audio_int_bus_parent(afe, CLK_CLK26M); -clk_mux_audio_intbus_err: +clk_mux_audio_intbus_parent_err: clk_disable_unprepare(afe_priv->clk[CLK_MUX_AUDIOINTBUS]); -clk_mux_audio_err: +clk_mux_audio_intbus_err: clk_disable_unprepare(afe_priv->clk[CLK_MUX_AUDIO]); -clk_infra_sys_audio_err: - clk_disable_unprepare(afe_priv->clk[CLK_INFRA_SYS_AUDIO]); -clk_infra_audio_26m_err: +clk_mux_audio_err: clk_disable_unprepare(afe_priv->clk[CLK_INFRA_AUDIO_26M]); +clk_infra_audio_26m_err: + clk_disable_unprepare(afe_priv->clk[CLK_INFRA_SYS_AUDIO]); +clk_infra_sys_audio_err: return ret; } -- 2.53.0