Skip to content

Commit

Permalink
ASoC: wm2000: fix missing clk_disable_unprepare() on error in wm2000_…
Browse files Browse the repository at this point in the history
…anc_transition()

[ Upstream commit be2af74 ]

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

Fixes: 514cfd6 ("ASoC: wm2000: Integrate with clock API")
Signed-off-by: Yang Yingliang <yangyingliang@huawei.com>
Acked-by: Charles Keepax <ckeepax@opensource.cirrus.com>
Link: https://lore.kernel.org/r/20220514091053.686416-1-yangyingliang@huawei.com
Signed-off-by: Mark Brown <broonie@kernel.org>
Signed-off-by: Sasha Levin <sashal@kernel.org>
  • Loading branch information
Yang Yingliang authored and gregkh committed Jun 9, 2022
1 parent cf9c07d commit 85a18d1
Showing 1 changed file with 3 additions and 3 deletions.
6 changes: 3 additions & 3 deletions sound/soc/codecs/wm2000.c
Expand Up @@ -536,7 +536,7 @@ static int wm2000_anc_transition(struct wm2000_priv *wm2000,
{
struct i2c_client *i2c = wm2000->i2c;
int i, j;
int ret;
int ret = 0;

if (wm2000->anc_mode == mode)
return 0;
Expand Down Expand Up @@ -566,13 +566,13 @@ static int wm2000_anc_transition(struct wm2000_priv *wm2000,
ret = anc_transitions[i].step[j](i2c,
anc_transitions[i].analogue);
if (ret != 0)
return ret;
break;
}

if (anc_transitions[i].dest == ANC_OFF)
clk_disable_unprepare(wm2000->mclk);

return 0;
return ret;
}

static int wm2000_anc_set_mode(struct wm2000_priv *wm2000)
Expand Down

0 comments on commit 85a18d1

Please sign in to comment.