summaryrefslogtreecommitdiffstats
path: root/sound/soc/soc-core.c
diff options
context:
space:
mode:
authorLars-Peter Clausen <lars@metafoo.de>2014-06-16 18:13:04 +0200
committerMark Brown <broonie@linaro.org>2014-06-21 21:06:56 +0100
commit7df3788410e674423375b88e2d95c46e4015f5f5 (patch)
treead672a6efd1eb7920a2d414d0e41a6e28cb751bf /sound/soc/soc-core.c
parentbb13109d85ba5f8009f1a26d840e70198537a4e3 (diff)
downloadblackbird-op-linux-7df3788410e674423375b88e2d95c46e4015f5f5.tar.gz
blackbird-op-linux-7df3788410e674423375b88e2d95c46e4015f5f5.zip
ASoC: Auto disconnect pins from all DAPM contexts
Currently only pins in CODEC DAPM contexts are automatically marked as non-connected if the card has the fully_routed flag set. This makes sense since widgets which qualify for auto-disconnection are only found in CODEC DAPM contexts. But with componentisation this is going to change, so consider all widgets for auto-disconnection. Also it is probably faster to walk the widgets list only once rather than once for each CODEC. Signed-off-by: Lars-Peter Clausen <lars@metafoo.de> Signed-off-by: Mark Brown <broonie@linaro.org>
Diffstat (limited to 'sound/soc/soc-core.c')
-rw-r--r--sound/soc/soc-core.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/sound/soc/soc-core.c b/sound/soc/soc-core.c
index 0944da66538d..bca8a7150a4a 100644
--- a/sound/soc/soc-core.c
+++ b/sound/soc/soc-core.c
@@ -1928,8 +1928,7 @@ static int snd_soc_instantiate_card(struct snd_soc_card *card)
}
if (card->fully_routed)
- list_for_each_entry(codec, &card->codec_dev_list, card_list)
- snd_soc_dapm_auto_nc_codec_pins(codec);
+ snd_soc_dapm_auto_nc_pins(card);
snd_soc_dapm_new_widgets(card);
OpenPOWER on IntegriCloud