[<prev] [next>] [thread-next>] [day] [month] [year] [list]
Message-ID: <1623929439-4289-1-git-send-email-zou_wei@huawei.com>
Date: Thu, 17 Jun 2021 19:30:39 +0800
From: Zou Wei <zou_wei@...wei.com>
To: <lgirdwood@...il.com>, <broonie@...nel.org>, <perex@...ex.cz>,
<tiwai@...e.com>, <thierry.reding@...il.com>,
<jonathanh@...dia.com>
CC: <alsa-devel@...a-project.org>, <linux-tegra@...r.kernel.org>,
<linux-kernel@...r.kernel.org>, Zou Wei <zou_wei@...wei.com>
Subject: [PATCH -next] ASoC: tegra: Fix missing clk_disable_unprepare() on error path
Fix the missing clk_disable_unprepare() before return
from tegra_machine_hw_params() in the error handling case.
Reported-by: Hulk Robot <hulkci@...wei.com>
Signed-off-by: Zou Wei <zou_wei@...wei.com>
---
sound/soc/tegra/tegra_asoc_machine.c | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/sound/soc/tegra/tegra_asoc_machine.c b/sound/soc/tegra/tegra_asoc_machine.c
index a53aec3..397f326 100644
--- a/sound/soc/tegra/tegra_asoc_machine.c
+++ b/sound/soc/tegra/tegra_asoc_machine.c
@@ -306,6 +306,7 @@ static int tegra_machine_hw_params(struct snd_pcm_substream *substream,
err = snd_soc_dai_set_sysclk(codec_dai, clk_id, mclk, SND_SOC_CLOCK_IN);
if (err < 0) {
+ clk_disable_unprepare(machine->clk_cdev1);
dev_err(card->dev, "codec_dai clock not set: %d\n", err);
return err;
}
@@ -523,8 +524,10 @@ int tegra_asoc_machine_probe(struct platform_device *pdev)
}
err = devm_snd_soc_register_card(dev, card);
- if (err)
+ if (err) {
+ clk_disable_unprepare(machine->clk_cdev1);
return err;
+ }
return 0;
}
--
2.6.2
Powered by blists - more mailing lists