Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 9934025c authored by Yang Yingliang's avatar Yang Yingliang Committed by Greg Kroah-Hartman
Browse files

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



[ Upstream commit be2af740e2a9c7134f2d8ab4f104006e110b13de ]

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: default avatarYang Yingliang <yangyingliang@huawei.com>
Acked-by: default avatarCharles Keepax <ckeepax@opensource.cirrus.com>
Link: https://lore.kernel.org/r/20220514091053.686416-1-yangyingliang@huawei.com


Signed-off-by: default avatarMark Brown <broonie@kernel.org>
Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
parent b3461cca

sound/soc/codecs/wm2000.c

+3 −3
Original line number Diff line number Diff line
@@ -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;
@@ -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)