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

Commit d6d8d1db authored by Mark Brown's avatar Mark Brown Committed by Greg Kroah-Hartman
Browse files

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



commit 564778d7b1ea465f9487eedeece7527a033549c5 upstream.

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-2-broonie@kernel.org


Signed-off-by: default avatarMark Brown <broonie@kernel.org>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 99c2b13c

sound/soc/soc-ops.c

+10 −4
Original line number Diff line number Diff line
@@ -314,7 +314,7 @@ int snd_soc_put_volsw(struct snd_kcontrol *kcontrol, 
	unsigned int sign_bit = mc->sign_bit;

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

	unsigned int invert = mc->invert;

	int err;

	int err, ret;

	bool type_2r = false;

	unsigned int val2 = 0;

	unsigned int val, val_mask;
@@ -356,12 +356,18 @@ int snd_soc_put_volsw(struct snd_kcontrol *kcontrol, 
	err = snd_soc_component_update_bits(component, reg, val_mask, val);

	if (err < 0)

		return err;

	ret = err;



	if (type_2r)

	if (type_2r) {

		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;

	return ret;

}

EXPORT_SYMBOL_GPL(snd_soc_put_volsw);