diff options
author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2010-05-10 13:36:37 -0400 |
---|---|---|
committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2010-05-11 09:18:52 -0400 |
commit | 6a2f1ee1f9bb5346644105c9355e9e06f6a847d3 (patch) | |
tree | 719b0527b550024d20b92be1917f76ddabbf1f55 /sound/soc/codecs | |
parent | 6adb26bd03f6056357298bc29d5c6acdea2b216a (diff) |
ASoC: Don't restart unconfigured WM8994 FLLs
If the FLL is not configured attempting to resume it will produce a
warning message so skip the resume.
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Acked-by: Liam Girdwood <lrg@slimlogic.co.uk>
Diffstat (limited to 'sound/soc/codecs')
-rw-r--r-- | sound/soc/codecs/wm8994.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/sound/soc/codecs/wm8994.c b/sound/soc/codecs/wm8994.c index c6b3f1ebd62e..dda356591fdb 100644 --- a/sound/soc/codecs/wm8994.c +++ b/sound/soc/codecs/wm8994.c | |||
@@ -3548,6 +3548,9 @@ static int wm8994_resume(struct platform_device *pdev) | |||
3548 | wm8994_set_bias_level(codec, SND_SOC_BIAS_STANDBY); | 3548 | wm8994_set_bias_level(codec, SND_SOC_BIAS_STANDBY); |
3549 | 3549 | ||
3550 | for (i = 0; i < ARRAY_SIZE(wm8994->fll); i++) { | 3550 | for (i = 0; i < ARRAY_SIZE(wm8994->fll); i++) { |
3551 | if (!wm8994->fll_suspend[i].out) | ||
3552 | continue; | ||
3553 | |||
3551 | ret = wm8994_set_fll(&codec->dai[0], i + 1, | 3554 | ret = wm8994_set_fll(&codec->dai[0], i + 1, |
3552 | wm8994->fll_suspend[i].src, | 3555 | wm8994->fll_suspend[i].src, |
3553 | wm8994->fll_suspend[i].in, | 3556 | wm8994->fll_suspend[i].in, |