mirror of
https://github.com/Fishwaldo/Star64_linux.git
synced 2025-03-16 12:14:06 +00:00
ASoC: ops: Correct bounds check for second channel on SX controls
commitf33bcc5060
upstream. 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:97eea946b9
("ASoC: ops: Check bounds for second channel in snd_soc_put_volsw_sx()") Signed-off-by: Charles Keepax <ckeepax@opensource.cirrus.com> Link: https://lore.kernel.org/r/20221125162348.1288005-1-ckeepax@opensource.cirrus.com Signed-off-by: Mark Brown <broonie@kernel.org> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
parent
63ac42981a
commit
0562e31d22
1 changed files with 3 additions and 4 deletions
|
@ -447,16 +447,15 @@ int snd_soc_put_volsw_sx(struct snd_kcontrol *kcontrol,
|
|||
ret = err;
|
||||
|
||||
if (snd_soc_volsw_is_stereo(mc)) {
|
||||
unsigned int val2;
|
||||
|
||||
val_mask = mask << rshift;
|
||||
val2 = (ucontrol->value.integer.value[1] + min) & mask;
|
||||
unsigned int val2 = ucontrol->value.integer.value[1];
|
||||
|
||||
if (mc->platform_max && val2 > mc->platform_max)
|
||||
return -EINVAL;
|
||||
if (val2 > max)
|
||||
return -EINVAL;
|
||||
|
||||
val_mask = mask << rshift;
|
||||
val2 = (val2 + min) & mask;
|
||||
val2 = val2 << rshift;
|
||||
|
||||
err = snd_soc_component_update_bits(component, reg2, val_mask,
|
||||
|
|
Loading…
Add table
Reference in a new issue