Unverified Commit 7f3d90a3 authored by Mark Brown's avatar Mark Brown
Browse files

ASoC: ops: Fix stereo change notifications in snd_soc_put_volsw_sx() 



When writing out a stereo control we discard the change notification from
the first channel, meaning that events are only generated based on changes
to the second channel. Ensure that we report a change if either channel
has changed.

Signed-off-by: default avatarMark Brown <broonie@kernel.org>
Cc: stable@vger.kernel.org
Link: https://lore.kernel.org/r/20220201155629.120510-3-broonie@kernel.org


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

sound/soc/soc-ops.c

+7 −0
Original line number Diff line number Diff line
@@ -427,6 +427,7 @@ int snd_soc_put_volsw_sx(struct snd_kcontrol *kcontrol, 
	int min = mc->min;

	unsigned int mask = (1U << (fls(min + max) - 1)) - 1;

	int err = 0;

	int ret;

	unsigned int val, val_mask;



	if (ucontrol->value.integer.value[0] < 0)
@@ -443,6 +444,7 @@ int snd_soc_put_volsw_sx(struct snd_kcontrol *kcontrol, 
	err = snd_soc_component_update_bits(component, reg, val_mask, val);

	if (err < 0)

		return err;

	ret = err;



	if (snd_soc_volsw_is_stereo(mc)) {

		unsigned int val2;
@@ -453,6 +455,11 @@ int snd_soc_put_volsw_sx(struct snd_kcontrol *kcontrol, 


		err = snd_soc_component_update_bits(component, reg2, val_mask,

			val2);



		/* Don't discard any error code or drop change flag */

		if (ret == 0 || err < 0) {

			ret = err;

		}

	}

	return err;

}