[PATCH] ASoC: amd: add missed checks for clk_get()
cz_da7219_init() does not check the return value of clk_get(), while da7219_clk_enable() calls clk_set_rate() to dereference the pointers. Add checks to fix the problems.
Fixes: bb24a31ed584 ("ASoC: AMD: Configure wclk and bclk of master codec") Signed-off-by: Chuhong Yuan hslester96@gmail.com --- sound/soc/amd/acp-da7219-max98357a.c | 5 +++++ 1 file changed, 5 insertions(+)
diff --git a/sound/soc/amd/acp-da7219-max98357a.c b/sound/soc/amd/acp-da7219-max98357a.c index a7702e64ec51..d5185cd3106b 100644 --- a/sound/soc/amd/acp-da7219-max98357a.c +++ b/sound/soc/amd/acp-da7219-max98357a.c @@ -74,7 +74,12 @@ static int cz_da7219_init(struct snd_soc_pcm_runtime *rtd) }
da7219_dai_wclk = clk_get(component->dev, "da7219-dai-wclk"); + if (IS_ERR(da7219_dai_wclk)) + return PTR_ERR(da7219_dai_wclk); + da7219_dai_bclk = 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 |
On Thu, Dec 03, 2020 at 10:31:16PM +0800, Chuhong Yuan wrote:
da7219_dai_wclk = clk_get(component->dev, "da7219-dai-wclk");
- if (IS_ERR(da7219_dai_wclk))
return PTR_ERR(da7219_dai_wclk);
- da7219_dai_bclk = clk_get(component->dev, "da7219-dai-bclk");
- if (IS_ERR(da7219_dai_bclk))
return PTR_ERR(da7219_dai_bclk);
This is also buggy - instead of ignoring the errors (which is an issue) we now leak the wclk if the bclk fails. Probably should convert to devm as well.
participants (2)
-
Chuhong Yuan
-
Mark Brown