The patch below does not apply to the 5.4-stable tree. If someone wants it applied there, or to any other stable or longterm tree, then please email the backport, including the original git commit id to stable@vger.kernel.org.
To reproduce the conflict and resubmit, you may use the following commands:
git fetch https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/ linux-5.4.y git checkout FETCH_HEAD git cherry-pick -x a46d37012a5be1737393b8f82fd35665e4556eee # <resolve conflicts, build, test, etc.> git commit -s git send-email --to 'stable@vger.kernel.org' --in-reply-to '2023071637-hankering-crop-89ef@gregkh' --subject-prefix 'PATCH 5.4.y' HEAD^..
Possible dependencies:
a46d37012a5b ("ASoC: mediatek: mt8173: Fix snd_soc_component_initialize error path") 8c32984bc7da ("ASoC: mediatek: mt8173: Fix debugfs registration for components")
thanks,
greg k-h
------------------ original commit in Linus's tree ------------------
From a46d37012a5be1737393b8f82fd35665e4556eee Mon Sep 17 00:00:00 2001 From: Ricardo Ribalda Delgado ribalda@chromium.org Date: Mon, 12 Jun 2023 11:05:31 +0200 Subject: [PATCH] ASoC: mediatek: mt8173: Fix snd_soc_component_initialize error path
If the second component fails to initialize, cleanup the first on.
Reported-by: Dan Carpenter dan.carpenter@linaro.org Cc: stable@kernel.org Fixes: f1b5bf07365d ("ASoC: mt2701/mt8173: replace platform to component") Signed-off-by: Ricardo Ribalda Delgado ribalda@chromium.org Reviewed-by: AngeloGioacchino Del Regno angelogioacchino.delregno@collabora.com Link: https://lore.kernel.org/r/20230612-mt8173-fixup-v2-1-432aa99ce24d@chromium.o... Signed-off-by: Mark Brown broonie@kernel.org
diff --git a/sound/soc/mediatek/mt8173/mt8173-afe-pcm.c b/sound/soc/mediatek/mt8173/mt8173-afe-pcm.c index f93c2ec8beb7..ff25c44070a3 100644 --- a/sound/soc/mediatek/mt8173/mt8173-afe-pcm.c +++ b/sound/soc/mediatek/mt8173/mt8173-afe-pcm.c @@ -1156,14 +1156,14 @@ static int mt8173_afe_pcm_dev_probe(struct platform_device *pdev) comp_hdmi = devm_kzalloc(&pdev->dev, sizeof(*comp_hdmi), GFP_KERNEL); if (!comp_hdmi) { ret = -ENOMEM; - goto err_pm_disable; + goto err_cleanup_components; }
ret = snd_soc_component_initialize(comp_hdmi, &mt8173_afe_hdmi_dai_component, &pdev->dev); if (ret) - goto err_pm_disable; + goto err_cleanup_components;
#ifdef CONFIG_DEBUG_FS comp_hdmi->debugfs_prefix = "hdmi";