]> git.itanic.dy.fi Git - linux-stable/commitdiff
ASoC: jz4740-i2s: add missed checks for clk_get()
authorChuhong Yuan <hslester96@gmail.com>
Thu, 3 Dec 2020 14:42:27 +0000 (22:42 +0800)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Tue, 29 Dec 2020 12:42:38 +0000 (13:42 +0100)
[ Upstream commit 1c1fb2653a0c2e3f310c07eacd8fc3a10e08c97a ]

jz4740_i2s_set_sysclk() does not check the return values of clk_get(),
while the file dereferences the pointers in clk_put().
Add the missed checks to fix it.

Fixes: 11bd3dd1b7c2 ("ASoC: Add JZ4740 ASoC support")
Signed-off-by: Chuhong Yuan <hslester96@gmail.com>
Link: https://lore.kernel.org/r/20201203144227.418194-1-hslester96@gmail.com
Signed-off-by: Mark Brown <broonie@kernel.org>
Signed-off-by: Sasha Levin <sashal@kernel.org>
sound/soc/jz4740/jz4740-i2s.c

index 0dc1ab48fcebe6586f3f00b943cefbf29d9d3b2a..6440729facaf0a914d108c81d28e50e91339a209 100644 (file)
@@ -315,10 +315,14 @@ static int jz4740_i2s_set_sysclk(struct snd_soc_dai *dai, int clk_id,
        switch (clk_id) {
        case JZ4740_I2S_CLKSRC_EXT:
                parent = clk_get(NULL, "ext");
+               if (IS_ERR(parent))
+                       return PTR_ERR(parent);
                clk_set_parent(i2s->clk_i2s, parent);
                break;
        case JZ4740_I2S_CLKSRC_PLL:
                parent = clk_get(NULL, "pll half");
+               if (IS_ERR(parent))
+                       return PTR_ERR(parent);
                clk_set_parent(i2s->clk_i2s, parent);
                ret = clk_set_rate(i2s->clk_i2s, freq);
                break;