OpenE2K
/
linux
6
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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

commit c9e065c27f upstream.

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 5729507 ("ASoC: dapm: Implement mixer input auto-disable")
Signed-off-by: Lars-Peter Clausen <lars@metafoo.de>
Signed-off-by: Mark Brown <broonie@linaro.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Lars-Peter Clausen 2014-05-04 19:17:05 +02:00 committed by Greg Kroah-Hartman
parent fd81b2dc6f
commit 5540c02cd6
1 changed files with 10 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
sound/soc/soc-dapm.c
View File

@ -2888,22 +2888,19 @@ int snd_soc_dapm_put_volsw(struct snd_kcontrol *kcontrol,
mutex_lock_nested(&card->dapm_mutex, SND_SOC_DAPM_CLASS_RUNTIME);
change = dapm_kcontrol_set_value(kcontrol, val);
if (reg != SND_SOC_NOPM) {
mask = mask << shift;
val = val << shift;
change = snd_soc_test_bits(codec, reg, mask, val);
}
if (change) {
if (reg != SND_SOC_NOPM) {
update.kcontrol = kcontrol;
update.reg = reg;
update.mask = mask;
update.val = val;
mask = mask << shift;
val = val << shift;
if (snd_soc_test_bits(codec, reg, mask, val)) {
update.kcontrol = kcontrol;
update.reg = reg;
update.mask = mask;
update.val = val;
card->update = &update;
}
card->update = &update;
}
ret = soc_dapm_mixer_update_power(card, kcontrol, connect);