summaryrefslogtreecommitdiffstats
path: root/sound/soc
diff options
context:
space:
mode:
authorChuhong Yuan <hslester96@gmail.com>2020-12-03 22:42:27 +0800
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2020-12-29 13:46:58 +0100
commit1d3b3ff7904e6a37b1cbbe870e8e69a4e801794c (patch)
tree6a44717d9b4c93bbbe930e0904324c37e8681348 /sound/soc
parent9d721c893dd1d7739f9b506c903ef07627f835e5 (diff)
downloadlinux-stable-1d3b3ff7904e6a37b1cbbe870e8e69a4e801794c.tar.gz
linux-stable-1d3b3ff7904e6a37b1cbbe870e8e69a4e801794c.tar.bz2
linux-stable-1d3b3ff7904e6a37b1cbbe870e8e69a4e801794c.zip
ASoC: jz4740-i2s: add missed checks for clk_get()
[ 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>
Diffstat (limited to 'sound/soc')
-rw-r--r--sound/soc/jz4740/jz4740-i2s.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/sound/soc/jz4740/jz4740-i2s.c b/sound/soc/jz4740/jz4740-i2s.c
index e099c0505b76..2c6b0ac97c68 100644
--- a/sound/soc/jz4740/jz4740-i2s.c
+++ b/sound/soc/jz4740/jz4740-i2s.c
@@ -318,10 +318,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;