]> git.proxmox.com Git - mirror_ubuntu-kernels.git/commitdiff
ASoC: soc-core: care .ignore_suspend for Component suspend
authorKuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Fri, 10 Jan 2020 02:36:02 +0000 (11:36 +0900)
committerMark Brown <broonie@kernel.org>
Fri, 10 Jan 2020 13:32:31 +0000 (13:32 +0000)
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>
sound/soc/soc-core.c

index 9a6d905cda43c10ac250aaa8e53a17a21027071f..8a1b4ffa6ca631580c1bb538c80207127c50ea24 100644 (file)
@@ -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:
                                /*