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=1795054790; b=1NWSKMZa+xhdXdIDkAreJWe+WgvJbNNaYujw6mQ66yd2FzWc88wKlO4aeMkYMONB+Tgr U7P007JJ5dXKooqF38LqbIn8PjkKYONZkFSNM+nc2RfYfUf1aQM9IoKps6CPvZ84ie1rs LXPKhTA1D34FUaAitxKd4oewda2Lffsa2x6IPu81UwRsNQw16KB+VIrx0cPAuzfPmyVB3 Ya7oLh9j8qm0WKMP6ggWRpAdY3EXXRR9v9SSbBPxMRHIRHXIODa+7bma5aiPId31EbWZV 9mTuTwWBYbmDaUSVxVIzUGS8wH7V4MSF2IPW58H+qTQLV1Sx76S/KLzp9buLEepUUvw== ARC-Message-Signature: i=1; d=subspace.kernel.org; s=arc20261015; a=rsa-sha256; c=relaxed/relaxed; t=1795054790; 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=2Tvv2kWpBMYrFcHAAf7FjkUxztg6qhM26EmmXTnx+jI=; b=uHuVQtJJogRMXRtEXc1u1X9dTCeSKXEfJgfRtSj6kb62ddk5yMC4nzThi2BUBsixdXC4 GQZD+HjlcW64eblqDeQhfCwK/cFUvZwOJpGBKHxnok+XV2jwrEzisXhtw1CsZE+cvgbeu 8BwS4epAXZE4bRM8i0xq32ZCNTpwulQIUEE0V4xbL7Emf8ZlSMBnDUWi4b73evShtv7oz VGwqq2dPy8zEJtsmRvY5PdilrUnVWXJdrReSv0MoTzSqT3LDCn0sD/81r0xOEXVkuliN5 uv7fQxMXG1nQbff/CtyRKO8fh7kM85VIDKQ2a7ZYQr8Ah2ke8d1o1wiD5EX/YkMxL9g== 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="HPbsP/7+"; 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 43BAC606A31C; Thu, 19 Nov 2026 02:19: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=HPbsP/7+ Received: by smtp.kernel.org (Postfix) with ESMTPSA id 928481F000C4; Thu, 19 Nov 2026 02:19:49 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linuxfoundation.org; s=korg; t=1795054790; bh=2Tvv2kWpBMYrFcHAAf7FjkUxztg6qhM26EmmXTnx+jI=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=HPbsP/7+/w9q8R2DM44VzNXO7rKpLr1CZa46AOeq8WZKENer50grxHX4cyEDS9tD2 Ml0FCgaaxiisim/1dfUwO8Wby2zh7reR0fr/HGldm/5IBxrh+faCEXNDzEfQOpmgYW FYIEwsUZ5u8w0w/tZ/w4YAXi6bbLei1ezlxaPhfE= 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 1400/2214] ASoC: mediatek: mt6797: fix wrong unwind order and error code in enable_clock Date: Wed, 18 Nov 2026 15:51:16 +0100 Message-ID: <20261118150107.298143047@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 e967d479b65c778cd2394ab185e289beefcf996d ] The error paths in mt6797_afe_enable_clock() use incorrect goto labels, causing clocks that failed to enable to be disabled during cleanup. Fix the goto labels to only unwind clocks that were successfully enabled, and return the actual error code. Fixes: c5e7fca928d3 ("ASoC: mt6797: add structure define and clock control function for 6797") Reviewed-by: Cezary Rojewski Signed-off-by: bui duc phuc Link: https://patch.msgid.link/20260821122840.41266-2-phucduc.bui@gmail.com Signed-off-by: Mark Brown Signed-off-by: Sasha Levin --- sound/soc/mediatek/mt6797/mt6797-afe-clk.c | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/sound/soc/mediatek/mt6797/mt6797-afe-clk.c b/sound/soc/mediatek/mt6797/mt6797-afe-clk.c index 6f3e6acfcfab2..0ac04d73b7772 100644 --- a/sound/soc/mediatek/mt6797/mt6797-afe-clk.c +++ b/sound/soc/mediatek/mt6797/mt6797-afe-clk.c @@ -63,21 +63,21 @@ int mt6797_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_INFRA_SYS_AUD], ret); - goto CLK_INFRA_SYS_AUDIO_ERR; + return ret; } ret = clk_prepare_enable(afe_priv->clk[CLK_INFRA_SYS_AUD_26M]); if (ret) { dev_err(afe->dev, "%s(), clk_prepare_enable %s fail %d\n", __func__, aud_clks[CLK_INFRA_SYS_AUD_26M], ret); - goto CLK_INFRA_SYS_AUD_26M_ERR; + goto CLK_INFRA_SYS_AUDIO_ERR; } ret = clk_prepare_enable(afe_priv->clk[CLK_TOP_MUX_AUD]); if (ret) { dev_err(afe->dev, "%s(), clk_prepare_enable %s fail %d\n", __func__, aud_clks[CLK_TOP_MUX_AUD], ret); - goto CLK_MUX_AUDIO_ERR; + goto CLK_INFRA_SYS_AUD_26M_ERR; } ret = clk_set_parent(afe_priv->clk[CLK_TOP_MUX_AUD], @@ -93,13 +93,11 @@ int mt6797_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_TOP_MUX_AUD_BUS], ret); - goto CLK_MUX_AUDIO_INTBUS_ERR; + goto CLK_MUX_AUDIO_ERR; } - return ret; + return 0; -CLK_MUX_AUDIO_INTBUS_ERR: - clk_disable_unprepare(afe_priv->clk[CLK_TOP_MUX_AUD_BUS]); CLK_MUX_AUDIO_ERR: clk_disable_unprepare(afe_priv->clk[CLK_TOP_MUX_AUD]); CLK_INFRA_SYS_AUD_26M_ERR: @@ -107,7 +105,7 @@ int mt6797_afe_enable_clock(struct mtk_base_afe *afe) CLK_INFRA_SYS_AUDIO_ERR: clk_disable_unprepare(afe_priv->clk[CLK_INFRA_SYS_AUD]); - return 0; + return ret; } int mt6797_afe_disable_clock(struct mtk_base_afe *afe) -- 2.53.0