Skip to content

Commit

Permalink
ASoC: ops: Fix stereo change notifications in snd_soc_put_volsw_range()
Browse files Browse the repository at this point in the history
commit 650204d 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: Mark Brown <broonie@kernel.org>
Cc: stable@vger.kernel.org
Link: https://lore.kernel.org/r/20220201155629.120510-4-broonie@kernel.org
Signed-off-by: Mark Brown <broonie@kernel.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
  • Loading branch information
broonie authored and gregkh committed Feb 23, 2022
1 parent edb43ae commit ed1e33f
Showing 1 changed file with 10 additions and 5 deletions.
15 changes: 10 additions & 5 deletions sound/soc/soc-ops.c
Expand Up @@ -512,7 +512,7 @@ int snd_soc_put_volsw_range(struct snd_kcontrol *kcontrol,
unsigned int mask = (1 << fls(max)) - 1;
unsigned int invert = mc->invert;
unsigned int val, val_mask;
int ret;
int err, ret;

if (invert)
val = (max - ucontrol->value.integer.value[0]) & mask;
Expand All @@ -521,9 +521,10 @@ int snd_soc_put_volsw_range(struct snd_kcontrol *kcontrol,
val_mask = mask << shift;
val = val << shift;

ret = snd_soc_component_update_bits(component, reg, val_mask, val);
if (ret < 0)
return ret;
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)) {
if (invert)
Expand All @@ -533,8 +534,12 @@ int snd_soc_put_volsw_range(struct snd_kcontrol *kcontrol,
val_mask = mask << shift;
val = val << shift;

ret = snd_soc_component_update_bits(component, rreg, val_mask,
err = snd_soc_component_update_bits(component, rreg, val_mask,
val);
/* Don't discard any error code or drop change flag */
if (ret == 0 || err < 0) {
ret = err;
}
}

return ret;
Expand Down

0 comments on commit ed1e33f

Please sign in to comment.