Skip to contentSkip to conversation

ASoC: tegra: Fix missing clk_disable_unprepare() on error path

PATCH In review Zou Wei 2 participants 2 messages Jun 17, 2021

Subsystems (3)
lore
Share & tools
lore

Zou Wei

author
#0 lore raw

PATCH 1/1 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.

---
 sound/soc/tegra/tegra_asoc_machine.c | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)
sound/soc/tegra/tegra_asoc_machine.c +4 -1
index a53aec3..397f326 100644
@@ -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;
 }
Signature · 1 line
2.6.2
#1 lore raw

17.06.2021 14:30, Zou Wei пишет:

Quoted 14 lines

Fix the missing clk_disable_unprepare() before return from tegra_machine_hw_params() in the error handling case.

---
 sound/soc/tegra/tegra_asoc_machine.c | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)
sound/soc/tegra/tegra_asoc_machine.c +0 -0
index a53aec3..397f326 100644

sound/soc/tegra/tegra_asoc_machine.c static int tegra_machine_hw_params(struct snd_pcm_substream *substream, · line 309

Quoted 4 lines
sound/soc/tegra/tegra_asoc_machine.c +1 -0
@@ -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);

It should be the opposite, the clock must be enabled here and it could be re-enabled in the other error cases. In practice the chance of those errors is close to zero, so we don't care about them since we will have much bigger problems in that case.

sound/soc/tegra/tegra_asoc_machine.c int tegra_asoc_machine_probe(struct platform_device *pdev) · line 528

Quoted 10 lines
sound/soc/tegra/tegra_asoc_machine.c +2 -1
 		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);

We also don't disable clock after removing driver module. This is intentional because that clock is enabled to workaround obscure bug on one of devboards that I can't reproduce. Ideally we should should fix the bug and remove the clk-enable hack. So I'm not sure whether this is a worthwhile "fix".