]> git.proxmox.com Git - mirror_ubuntu-focal-kernel.git/commitdiff
ASoC: amd: change clk_get() to devm_clk_get() and add missed checks
authorChuhong Yuan <hslester96@gmail.com>
Fri, 4 Dec 2020 06:36:10 +0000 (14:36 +0800)
committerKleber Sacilotto de Souza <kleber.souza@canonical.com>
Wed, 20 Jan 2021 13:26:02 +0000 (14:26 +0100)
BugLink: https://bugs.launchpad.net/bugs/1910822
[ Upstream commit 95d3befbc5e1ee39fc8a78713924cf7ed2b3cabe ]

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>
Signed-off-by: Sasha Levin <sashal@kernel.org>
Signed-off-by: Kamal Mostafa <kamal@canonical.com>
Signed-off-by: Kelsey Skunberg <kelsey.skunberg@canonical.com>
sound/soc/amd/acp-da7219-max98357a.c

index f4ee6798154af52377c7a6949e8fc99a2b0134fe..1612ec65aaf664bc73297f245695c1ea5c21aaca 100644 (file)
@@ -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 |