Commit f33bcc50 authored by Charles Keepax's avatar Charles Keepax Committed by Mark Brown

ASoC: ops: Correct bounds check for second channel on SX controls

Currently the check against the max value for the control is being
applied after the value has had the minimum applied and been masked. But
the max value simply indicates the number of volume levels on an SX
control, and as such should just be applied on the raw value.

Fixes: 97eea946 ("ASoC: ops: Check bounds for second channel in snd_soc_put_volsw_sx()")
Signed-off-by: default avatarCharles Keepax <ckeepax@opensource.cirrus.com>
Link: https://lore.kernel.org/r/20221125162348.1288005-1-ckeepax@opensource.cirrus.comSigned-off-by: default avatarMark Brown <broonie@kernel.org>
parent 81cb291e
...@@ -464,16 +464,15 @@ int snd_soc_put_volsw_sx(struct snd_kcontrol *kcontrol, ...@@ -464,16 +464,15 @@ int snd_soc_put_volsw_sx(struct snd_kcontrol *kcontrol,
ret = err; ret = err;
if (snd_soc_volsw_is_stereo(mc)) { if (snd_soc_volsw_is_stereo(mc)) {
unsigned int val2; unsigned int val2 = ucontrol->value.integer.value[1];
val_mask = mask << rshift;
val2 = (ucontrol->value.integer.value[1] + min) & mask;
if (mc->platform_max && val2 > mc->platform_max) if (mc->platform_max && val2 > mc->platform_max)
return -EINVAL; return -EINVAL;
if (val2 > max) if (val2 > max)
return -EINVAL; return -EINVAL;
val_mask = mask << rshift;
val2 = (val2 + min) & mask;
val2 = val2 << rshift; val2 = val2 << rshift;
err = snd_soc_component_update_bits(component, reg2, val_mask, err = snd_soc_component_update_bits(component, reg2, val_mask,
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment