Unverified Commit 95d3befb authored Dec 04, 2020 by Chuhong Yuan Committed by Mark Brown Dec 08, 2020

ASoC: amd: change clk_get() to devm_clk_get() and add missed checks



cz_da7219_init() does not check the return values of clk_get(),
while da7219_clk_enable() calls clk_set_rate() to dereference
the pointers.
Add checks to fix the problems.
Also, change clk_get() to devm_clk_get() to avoid data leak after
failures.

Fixes: bb24a31e ("ASoC: AMD: Configure wclk and bclk of master codec")
Signed-off-by: Chuhong Yuan <hslester96@gmail.com>
Link: https://lore.kernel.org/r/20201204063610.513556-1-hslester96@gmail.com


Signed-off-by: Mark Brown <broonie@kernel.org>

parent 0d024a8b

sound/soc/amd/acp-da7219-max98357a.c

+7 −2

Original line number	Diff line number	Diff line
		@@ -73,8 +73,13 @@ static int cz_da7219_init(struct snd_soc_pcm_runtime *rtd)
		return ret;
		}

		da7219_dai_wclk = clk_get(component->dev, "da7219-dai-wclk");
		da7219_dai_bclk = clk_get(component->dev, "da7219-dai-bclk");
		da7219_dai_wclk = devm_clk_get(component->dev, "da7219-dai-wclk");
		if (IS_ERR(da7219_dai_wclk))
		return PTR_ERR(da7219_dai_wclk);

		da7219_dai_bclk = devm_clk_get(component->dev, "da7219-dai-bclk");
		if (IS_ERR(da7219_dai_bclk))
		return PTR_ERR(da7219_dai_bclk);

		ret = snd_soc_card_jack_new(card, "Headset Jack",
		SND_JACK_HEADSET \| SND_JACK_LINEOUT \|

Admin message