Commit c9e065c2 authored by Lars-Peter Clausen's avatar Lars-Peter Clausen Committed by Mark Brown

ASoC: dapm: Make sure to always update the DAPM graph in _put_volsw()

When using auto-muted controls it may happen that the register value will not
change when changing a control from enabled to disabled (since the control might
be physically disabled due to the auto-muting). We have to make sure to still
update the DAPM graph and disconnect the mixer input.

Fixes: commit 57295073 ("ASoC: dapm: Implement mixer input auto-disable")
Signed-off-by: default avatarLars-Peter Clausen <lars@metafoo.de>
Signed-off-by: default avatarMark Brown <broonie@linaro.org>
parent 00a41d9f
...@@ -2792,24 +2792,21 @@ int snd_soc_dapm_put_volsw(struct snd_kcontrol *kcontrol, ...@@ -2792,24 +2792,21 @@ int snd_soc_dapm_put_volsw(struct snd_kcontrol *kcontrol,
mutex_lock_nested(&card->dapm_mutex, SND_SOC_DAPM_CLASS_RUNTIME); mutex_lock_nested(&card->dapm_mutex, SND_SOC_DAPM_CLASS_RUNTIME);
change = dapm_kcontrol_set_value(kcontrol, val); change = dapm_kcontrol_set_value(kcontrol, val);
if (change) {
if (reg != SND_SOC_NOPM) { if (reg != SND_SOC_NOPM) {
mask = mask << shift; mask = mask << shift;
val = val << shift; val = val << shift;
change = snd_soc_test_bits(codec, reg, mask, val); if (snd_soc_test_bits(codec, reg, mask, val)) {
}
if (change) {
if (reg != SND_SOC_NOPM) {
update.kcontrol = kcontrol; update.kcontrol = kcontrol;
update.reg = reg; update.reg = reg;
update.mask = mask; update.mask = mask;
update.val = val; update.val = val;
card->update = &update; card->update = &update;
} }
}
ret = soc_dapm_mixer_update_power(card, kcontrol, connect); ret = soc_dapm_mixer_update_power(card, kcontrol, connect);
card->update = NULL; card->update = NULL;
......
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