Commit cbf9c5ae authored by Mark Brown's avatar Mark Brown

Merge remote-tracking branch 'asoc/fix/core' into tmp

parents ee3aee6a 0eaa6cca
...@@ -2963,7 +2963,7 @@ int snd_soc_put_volsw_range(struct snd_kcontrol *kcontrol, ...@@ -2963,7 +2963,7 @@ int snd_soc_put_volsw_range(struct snd_kcontrol *kcontrol,
val = val << shift; val = val << shift;
ret = snd_soc_update_bits_locked(codec, reg, val_mask, val); ret = snd_soc_update_bits_locked(codec, reg, val_mask, val);
if (ret != 0) if (ret < 0)
return ret; return ret;
if (snd_soc_volsw_is_stereo(mc)) { if (snd_soc_volsw_is_stereo(mc)) {
......
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