diff options
| author | Chuhong Yuan <hslester96@gmail.com> | 2020-12-04 14:36:10 +0800 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2020-12-08 17:06:36 +0000 |
| commit | 95d3befbc5e1ee39fc8a78713924cf7ed2b3cabe (patch) | |
| tree | 42275b48e28a4d3eab1c74c1c71adb67ed3d907c /sound/soc/amd | |
| parent | 0d024a8bec084205fdd9fa17479ba91f45f85db3 (diff) | |
| download | linux-95d3befbc5e1ee39fc8a78713924cf7ed2b3cabe.tar.gz linux-95d3befbc5e1ee39fc8a78713924cf7ed2b3cabe.tar.bz2 linux-95d3befbc5e1ee39fc8a78713924cf7ed2b3cabe.zip | |
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: bb24a31ed584 ("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>
Diffstat (limited to 'sound/soc/amd')
| -rw-r--r-- | sound/soc/amd/acp-da7219-max98357a.c | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/sound/soc/amd/acp-da7219-max98357a.c b/sound/soc/amd/acp-da7219-max98357a.c index a7702e64ec51..849288d01c6b 100644 --- a/sound/soc/amd/acp-da7219-max98357a.c +++ b/sound/soc/amd/acp-da7219-max98357a.c @@ -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 | |