Unverified Commit c15bc168 authored by Hsieh Hung-En's avatar Hsieh Hung-En Committed by Mark Brown
Browse files

ASoC: es8311: Fix clock leak and check update_bits in set_bias_level() 



In es8311_set_bias_level(), the return value of
snd_soc_component_update_bits() was ignored. If this fails, not only
is the VMID selection not applied, but the previously enabled mclk
is left running, leading to an unbalanced clock reference count
(clock leak).

Check the return value and ensure clk_disable_unprepare() is called on
failure to maintain proper resource management.

Signed-off-by: default avatarHsieh Hung-En <hungen3108@gmail.com>
Link: https://patch.msgid.link/20260415030252.5547-3-hungen3108@gmail.com


Signed-off-by: default avatarMark Brown <broonie@kernel.org>
parent 37e9faf2

sound/soc/codecs/es8311.c

+10 −5
Original line number Diff line number Diff line
@@ -761,6 +761,7 @@ static int es8311_set_bias_level(struct snd_soc_component *component, 
{

	struct es8311_priv *es8311 = snd_soc_component_get_drvdata(component);

	struct snd_soc_dapm_context *dapm = snd_soc_component_to_dapm(component);

	int ret;



	switch (level) {

	case SND_SOC_BIAS_ON:
@@ -769,17 +770,21 @@ static int es8311_set_bias_level(struct snd_soc_component *component, 
		break;

	case SND_SOC_BIAS_STANDBY:

		if (snd_soc_dapm_get_bias_level(dapm) == SND_SOC_BIAS_OFF) {

			int ret = clk_prepare_enable(es8311->mclk);

			ret = clk_prepare_enable(es8311->mclk);

			if (ret) {

				dev_err(component->dev,

					"unable to prepare mclk\n");

				return ret;

			}



			snd_soc_component_update_bits(

			ret = snd_soc_component_update_bits(

				      component, ES8311_SYS3,

				      ES8311_SYS3_PDN_VMIDSEL_MASK,

				      ES8311_SYS3_PDN_VMIDSEL_STARTUP_NORMAL_SPEED);

			if (ret < 0) {

				clk_disable_unprepare(es8311->mclk);

				return ret;

			}

		}



		break;