On 2/1/22 09:56, Mark Brown wrote:
> 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: Mark Brown <broonie@xxxxxxxxxx>
> Cc: stable@xxxxxxxxxxxxxxx
> ---
> sound/soc/soc-ops.c | 7 +++++++
> 1 file changed, 7 insertions(+)
>
> diff --git a/sound/soc/soc-ops.c b/sound/soc/soc-ops.c
> index 73c9d53de25b..f0d1aeb38346 100644
> --- a/sound/soc/soc-ops.c
> +++ b/sound/soc/soc-ops.c
> @@ -413,6 +413,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;
>
> val_mask = mask << shift;
> @@ -422,6 +423,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;
> @@ -432,6 +434,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;
cppcheck flags a warning on this patch, I believe we should use "return ret;" here, as done in the other patches of this series?
https://github.com/thesofproject/linux/pull/3597/commits/85b667d190953231ef314ac429019a011596f6d7
