diff options
| author | Kuninori Morimoto <kuninori.morimoto.gx@renesas.com> | 2020-01-10 03:36:02 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2020-01-10 14:32:31 +0100 |
| commit | 1272063a7ee4e60ace4cf7cae621fb6f8cafaaba (patch) | |
| tree | bd3a4337ac5f730862cf33f28c4cdbe59ee538e8 | |
| parent | ASoC: soc-core: rename snd_soc_rtdcom_add() to snd_soc_rtd_add_component() (diff) | |
| download | linux-1272063a7ee4e60ace4cf7cae621fb6f8cafaaba.tar.xz linux-1272063a7ee4e60ace4cf7cae621fb6f8cafaaba.zip | |
ASoC: soc-core: care .ignore_suspend for Component suspend
Card dai_link has .ignore_suspend, and ALSA SoC cares it when suspend.
For example, like this
for_each_card_rtds(card, rtd) {
if (rtd->dai_link->ignore_suspend)
continue;
...
}
But in snd_soc_suspend(), it doesn't care about
it when suspending Component. This patch cares it.
Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Link: https://lore.kernel.org/r/877e20t4vh.wl-kuninori.morimoto.gx@renesas.com
Signed-off-by: Mark Brown <broonie@kernel.org>
| -rw-r--r-- | sound/soc/soc-core.c | 24 |
1 files changed, 17 insertions, 7 deletions
diff --git a/sound/soc/soc-core.c b/sound/soc/soc-core.c index 9a6d905cda43..8a1b4ffa6ca6 100644 --- a/sound/soc/soc-core.c +++ b/sound/soc/soc-core.c @@ -562,15 +562,25 @@ int snd_soc_suspend(struct device *dev) snd_soc_dapm_sync(&card->dapm); /* suspend all COMPONENTs */ - for_each_card_components(card, component) { - struct snd_soc_dapm_context *dapm = + for_each_card_rtds(card, rtd) { + + if (rtd->dai_link->ignore_suspend) + continue; + + for_each_rtd_components(rtd, i, component) { + struct snd_soc_dapm_context *dapm = snd_soc_component_get_dapm(component); - /* - * If there are paths active then the COMPONENT will be held - * with bias _ON and should not be suspended. - */ - if (!snd_soc_component_is_suspended(component)) { + /* + * ignore if component was already suspended + */ + if (snd_soc_component_is_suspended(component)) + continue; + + /* + * If there are paths active then the COMPONENT will be + * held with bias _ON and should not be suspended. + */ switch (snd_soc_dapm_get_bias_level(dapm)) { case SND_SOC_BIAS_STANDBY: /* |