diff options
| author | Mark Brown <broonie@kernel.org> | 2016-09-29 22:43:11 +0300 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2016-09-29 22:43:11 +0300 |
| commit | 195dee5647c76a4edcd762b82c626a990e349ff6 (patch) | |
| tree | 6dc73416357cf2b3445ff57d657a34623446fb41 | |
| parent | 08895a8b6b06ed2323cd97a36ee40a116b3db8ed (diff) | |
| parent | a3930ed060df4ccf2a06cf0b68738dec3e6ff89a (diff) | |
| download | linux-195dee5647c76a4edcd762b82c626a990e349ff6.tar.xz | |
Merge remote-tracking branch 'asoc/fix/dapm' into asoc-linus
| -rw-r--r-- | sound/soc/soc-dapm.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/sound/soc/soc-dapm.c b/sound/soc/soc-dapm.c index d908ff8f9755..801082fdc3e0 100644 --- a/sound/soc/soc-dapm.c +++ b/sound/soc/soc-dapm.c @@ -823,6 +823,7 @@ static int dapm_create_or_share_kcontrol(struct snd_soc_dapm_widget *w, case snd_soc_dapm_switch: case snd_soc_dapm_mixer: case snd_soc_dapm_pga: + case snd_soc_dapm_out_drv: wname_in_long_name = true; kcname_in_long_name = true; break; @@ -3049,6 +3050,9 @@ int snd_soc_dapm_get_volsw(struct snd_kcontrol *kcontrol, } mutex_unlock(&card->dapm_mutex); + if (ret) + return ret; + if (invert) ucontrol->value.integer.value[0] = max - val; else @@ -3200,7 +3204,7 @@ int snd_soc_dapm_put_enum_double(struct snd_kcontrol *kcontrol, if (e->shift_l != e->shift_r) { if (item[1] > e->items) return -EINVAL; - val |= snd_soc_enum_item_to_val(e, item[1]) << e->shift_l; + val |= snd_soc_enum_item_to_val(e, item[1]) << e->shift_r; mask |= e->mask << e->shift_r; } |