xiaomi-sm8450/android_kernel_xiaomi_sm8450
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

ASoC: hisilicon: fix missing clk_disable_unprepare() on error in hi6210_i2s_startup()

Browse Source 
[ Upstream commit 375904e3931955fcf0a847f029b2492a117efc43 ]

After calling clk_prepare_enable(), clk_disable_unprepare() need
be called when calling clk_set_rate() failed.

Fixes: 0bf750f4cb ("ASoC: hisilicon: Add hi6210 i2s audio driver")
Reported-by: Hulk Robot <hulkci@huawei.com>
Signed-off-by: Yang Yingliang <yangyingliang@huawei.com>
Link: https://lore.kernel.org/r/20210518044514.607010-1-yangyingliang@huawei.com
Signed-off-by: Mark Brown <broonie@kernel.org>
Signed-off-by: Sasha Levin <sashal@kernel.org>
This commit is contained in:
Yang Yingliang
2021-05-18 12:45:14 +08:00
committed by Greg Kroah-Hartman
parent 2541d78f78
commit d4ebf352a7
1 changed files with 8 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
sound/soc/hisilicon/hi6210-i2s.c
View File

@@ -102,18 +102,15 @@ static int hi6210_i2s_startup(struct snd_pcm_substream *substream,
for (n = 0; n < i2s->clocks; n++) { for (n = 0; n < i2s->clocks; n++) {
ret = clk_prepare_enable(i2s->clk[n]); ret = clk_prepare_enable(i2s->clk[n]);
if (ret) { if (ret)
while (n--) goto err_unprepare_clk;
clk_disable_unprepare(i2s->clk[n]);
return ret;
}
} }
ret = clk_set_rate(i2s->clk[CLK_I2S_BASE], 49152000); ret = clk_set_rate(i2s->clk[CLK_I2S_BASE], 49152000);
if (ret) { if (ret) {
dev_err(i2s->dev, "%s: setting 49.152MHz base rate failed %d\n", dev_err(i2s->dev, "%s: setting 49.152MHz base rate failed %d\n",
__func__, ret); __func__, ret);
return ret; goto err_unprepare_clk;
} }
/* enable clock before frequency division */ /* enable clock before frequency division */
@@ -165,6 +162,11 @@ static int hi6210_i2s_startup(struct snd_pcm_substream *substream,
hi6210_write_reg(i2s, HII2S_SW_RST_N, val); hi6210_write_reg(i2s, HII2S_SW_RST_N, val);
return 0; return 0;
err_unprepare_clk:
while (n--)
clk_disable_unprepare(i2s->clk[n]);
return ret;
} }
static void hi6210_i2s_shutdown(struct snd_pcm_substream *substream, static void hi6210_i2s_shutdown(struct snd_pcm_substream *substream,