提交 d055852e 编写于 作者: M Mukund Navada 提交者: Mark Brown

ASoC: core: Double control update err for snd_soc_put_volsw_sx

snd_soc_put_volsw_sx function fails to update second control
if first control is updated by snd_soc_update_bits_locked.
Signed-off-by: NMukund Navada <navada@ti.com>
Signed-off-by: NMark Brown <broonie@opensource.wolfsonmicro.com>
Cc: stable@vger.kernel.org
上级 445632ad
...@@ -2786,7 +2786,8 @@ int snd_soc_put_volsw_sx(struct snd_kcontrol *kcontrol, ...@@ -2786,7 +2786,8 @@ int snd_soc_put_volsw_sx(struct snd_kcontrol *kcontrol,
val = (ucontrol->value.integer.value[0] + min) & mask; val = (ucontrol->value.integer.value[0] + min) & mask;
val = val << shift; val = val << shift;
if (snd_soc_update_bits_locked(codec, reg, val_mask, val)) err = snd_soc_update_bits_locked(codec, reg, val_mask, val);
if (err < 0)
return err; return err;
if (snd_soc_volsw_is_stereo(mc)) { if (snd_soc_volsw_is_stereo(mc)) {
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册