diff options
| author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2010-05-10 18:36:37 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2010-05-11 14:18:52 +0100 |
| commit | 6a2f1ee1f9bb5346644105c9355e9e06f6a847d3 (patch) | |
| tree | 719b0527b550024d20b92be1917f76ddabbf1f55 | |
| parent | 6adb26bd03f6056357298bc29d5c6acdea2b216a (diff) | |
| download | linux-stable-6a2f1ee1f9bb5346644105c9355e9e06f6a847d3.tar.gz linux-stable-6a2f1ee1f9bb5346644105c9355e9e06f6a847d3.tar.bz2 linux-stable-6a2f1ee1f9bb5346644105c9355e9e06f6a847d3.zip | |
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>
| -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) wm8994_set_bias_level(codec, SND_SOC_BIAS_STANDBY); for (i = 0; i < ARRAY_SIZE(wm8994->fll); i++) { + if (!wm8994->fll_suspend[i].out) + continue; + ret = wm8994_set_fll(&codec->dai[0], i + 1, wm8994->fll_suspend[i].src, wm8994->fll_suspend[i].in, |