]> git.karo-electronics.de Git - linux-beck.git/commitdiff
ASoC: byt-rt5640: Fix snd_soc_dapm_ignore_suspend() calls
authorLars-Peter Clausen <lars@metafoo.de>
Thu, 1 Jan 2015 10:23:44 +0000 (11:23 +0100)
committerMark Brown <broonie@kernel.org>
Tue, 6 Jan 2015 17:24:25 +0000 (17:24 +0000)
To work properly snd_soc_dapm_ignore_suspend() needs to be called on
endpoint widgets. In this case those are the board level Speaker and
Headphone widgets and not the CODEC output widgets that are connected to
them.

Signed-off-by: Lars-Peter Clausen <lars@metafoo.de>
Acked-by: Jarkko Nikula <jarkko.nikula@linux.intel.com>
Signed-off-by: Mark Brown <broonie@kernel.org>
sound/soc/intel/byt-rt5640.c

index 0cba7830c5e9df4d20ce90bab96625bf0596ff4b..a51856e9182652ddd5ac64c39f64c2e0769bd687 100644 (file)
@@ -171,13 +171,8 @@ static int byt_rt5640_init(struct snd_soc_pcm_runtime *runtime)
                        return ret;
        }
 
-       snd_soc_dapm_ignore_suspend(dapm, "HPOL");
-       snd_soc_dapm_ignore_suspend(dapm, "HPOR");
-
-       snd_soc_dapm_ignore_suspend(dapm, "SPOLP");
-       snd_soc_dapm_ignore_suspend(dapm, "SPOLN");
-       snd_soc_dapm_ignore_suspend(dapm, "SPORP");
-       snd_soc_dapm_ignore_suspend(dapm, "SPORN");
+       snd_soc_dapm_ignore_suspend(&card->dapm, "Headphone");
+       snd_soc_dapm_ignore_suspend(&card->dapm, "Speaker");
 
        return ret;
 }