From: Mark Brown <broonie@opensource.wolfsonmicro.com>
Date: Mon, 10 May 2010 17:36:37 +0000 (+0100)
Subject: ASoC: Don't restart unconfigured WM8994 FLLs
X-Git-Tag: v2.6.35-rc6~9^2~7^2~7
X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=6a2f1ee1f9bb5346644105c9355e9e06f6a847d3;p=~shefty%2Frdma-dev.git

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>
---

diff --git a/sound/soc/codecs/wm8994.c b/sound/soc/codecs/wm8994.c
index c6b3f1ebd62..dda356591fd 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,