提交 8f62a8d9 编写于 作者: Y Yang Yingliang 提交者: Zheng Zengkai

ASoC: wm2000: fix missing clk_disable_unprepare() on error in wm2000_anc_transition()

stable inclusion
from stable-v5.10.121
commit 7a5e6a48980e292e440ed10fe2b8ad9e3596d07b
category: bugfix
bugzilla: https://gitee.com/openeuler/kernel/issues/I5L6CQ

Reference: https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?id=7a5e6a48980e292e440ed10fe2b8ad9e3596d07b

--------------------------------

[ Upstream commit be2af740 ]

Fix the missing clk_disable_unprepare() before return
from wm2000_anc_transition() in the error handling case.

Fixes: 514cfd6d ("ASoC: wm2000: Integrate with clock API")
Signed-off-by: NYang Yingliang <yangyingliang@huawei.com>
Acked-by: NCharles Keepax <ckeepax@opensource.cirrus.com>
Link: https://lore.kernel.org/r/20220514091053.686416-1-yangyingliang@huawei.comSigned-off-by: NMark Brown <broonie@kernel.org>
Signed-off-by: NSasha Levin <sashal@kernel.org>
Signed-off-by: NZheng Zengkai <zhengzengkai@huawei.com>
Acked-by: NXie XiuQi <xiexiuqi@huawei.com>
上级 c9a04702
...@@ -536,7 +536,7 @@ static int wm2000_anc_transition(struct wm2000_priv *wm2000, ...@@ -536,7 +536,7 @@ static int wm2000_anc_transition(struct wm2000_priv *wm2000,
{ {
struct i2c_client *i2c = wm2000->i2c; struct i2c_client *i2c = wm2000->i2c;
int i, j; int i, j;
int ret; int ret = 0;
if (wm2000->anc_mode == mode) if (wm2000->anc_mode == mode)
return 0; return 0;
...@@ -566,13 +566,13 @@ static int wm2000_anc_transition(struct wm2000_priv *wm2000, ...@@ -566,13 +566,13 @@ static int wm2000_anc_transition(struct wm2000_priv *wm2000,
ret = anc_transitions[i].step[j](i2c, ret = anc_transitions[i].step[j](i2c,
anc_transitions[i].analogue); anc_transitions[i].analogue);
if (ret != 0) if (ret != 0)
return ret; break;
} }
if (anc_transitions[i].dest == ANC_OFF) if (anc_transitions[i].dest == ANC_OFF)
clk_disable_unprepare(wm2000->mclk); clk_disable_unprepare(wm2000->mclk);
return 0; return ret;
} }
static int wm2000_anc_set_mode(struct wm2000_priv *wm2000) static int wm2000_anc_set_mode(struct wm2000_priv *wm2000)
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册