summaryrefslogtreecommitdiff
path: root/sound/soc/intel
diff options
context:
space:
mode:
authorLars-Peter Clausen <lars@metafoo.de>2015-01-01 10:23:44 (GMT)
committerMark Brown <broonie@kernel.org>2015-01-06 17:24:25 (GMT)
commit7a81140b0ead01fcb27e6167b1015b06c36acbd0 (patch)
tree5dcc7f7241fbd9ddab47e39dbccdcc5caa86bae6 /sound/soc/intel
parent057a1573fd1309a6b3a039f9cd75b4e90f7f6cf4 (diff)
downloadlinux-7a81140b0ead01fcb27e6167b1015b06c36acbd0.tar.xz
ASoC: byt-rt5640: Fix snd_soc_dapm_ignore_suspend() calls
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>
Diffstat (limited to 'sound/soc/intel')
-rw-r--r--sound/soc/intel/byt-rt5640.c9
1 files changed, 2 insertions, 7 deletions
diff --git a/sound/soc/intel/byt-rt5640.c b/sound/soc/intel/byt-rt5640.c
index 0cba783..a51856e 100644
--- a/sound/soc/intel/byt-rt5640.c
+++ b/sound/soc/intel/byt-rt5640.c
@@ -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;
}