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

ASoC: es8328: Propagate error codes from regmap updates 



In es8328_hw_params(), the return value of
snd_soc_component_update_bits() was ignored. This could lead to silent
failures where the hardware is left in an inconsistent state if a
regmap write fails.

Check the return value of regmap updates and propagate any errors back
to the ALSA core. Return 0 on success to match the DAI ops convention.

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


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

sound/soc/codecs/es8328.c

+23 −11
Original line number Diff line number Diff line
@@ -461,6 +461,7 @@ static int es8328_hw_params(struct snd_pcm_substream *substream, 
{

	struct snd_soc_component *component = dai->component;

	struct es8328_priv *es8328 = snd_soc_component_get_drvdata(component);

	int ret;

	int i;

	int reg;

	int wl;
@@ -494,9 +495,12 @@ static int es8328_hw_params(struct snd_pcm_substream *substream, 
		es8328->mclkdiv2 = 0;

	}



	snd_soc_component_update_bits(component, ES8328_MASTERMODE,

	ret = snd_soc_component_update_bits(component, ES8328_MASTERMODE,

					    ES8328_MASTERMODE_MCLKDIV2,

			es8328->mclkdiv2 ? ES8328_MASTERMODE_MCLKDIV2 : 0);

					    es8328->mclkdiv2 ?

					    ES8328_MASTERMODE_MCLKDIV2 : 0);

	if (ret < 0)

		return ret;



	switch (params_width(params)) {

	case 16:
@@ -519,18 +523,26 @@ static int es8328_hw_params(struct snd_pcm_substream *substream, 
	}



	if (substream->stream == SNDRV_PCM_STREAM_PLAYBACK) {

		snd_soc_component_update_bits(component, ES8328_DACCONTROL1,

		ret = snd_soc_component_update_bits(component, ES8328_DACCONTROL1,

						    ES8328_DACCONTROL1_DACWL_MASK,

						    wl << ES8328_DACCONTROL1_DACWL_SHIFT);

		if (ret < 0)

			return ret;



		es8328->playback_fs = params_rate(params);

		es8328_set_deemph(component);

	} else

		snd_soc_component_update_bits(component, ES8328_ADCCONTROL4,

	} else {

		ret = snd_soc_component_update_bits(component, ES8328_ADCCONTROL4,

						    ES8328_ADCCONTROL4_ADCWL_MASK,

						    wl << ES8328_ADCCONTROL4_ADCWL_SHIFT);

		if (ret < 0)

			return ret;

	}



	return snd_soc_component_update_bits(component, reg, ES8328_RATEMASK, ratio);

	ret = snd_soc_component_update_bits(component, reg, ES8328_RATEMASK, ratio);

	if (ret < 0)

		return ret;

	return 0;

}



static int es8328_set_sysclk(struct snd_soc_dai *codec_dai,