aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMark Brown <broonie@linaro.org>2014-01-30 14:59:31 -0500
committerMark Brown <broonie@linaro.org>2014-02-03 07:50:59 -0500
commitdf6ab65f2fef3d7b769f3ba87c7bb265ace80b4e (patch)
tree3018457386def65dd246b73a1e132449cf191a2b
parent7e9614ebcf4d74edba864cc91e1e8a3ec6b32fc2 (diff)
ASoC: wm8962: Check if we runtime resume the device when starting FLL
Signed-off-by: Mark Brown <broonie@linaro.org> Acked-by: Charles Keepax <ckeepax@opensource.wolfsonmicro.com>
-rw-r--r--sound/soc/codecs/wm8962.c6
1 files changed, 5 insertions, 1 deletions
diff --git a/sound/soc/codecs/wm8962.c b/sound/soc/codecs/wm8962.c
index 1996567346c6..d7d43c9371f4 100644
--- a/sound/soc/codecs/wm8962.c
+++ b/sound/soc/codecs/wm8962.c
@@ -2886,7 +2886,11 @@ static int wm8962_set_fll(struct snd_soc_codec *codec, int fll_id, int source,
2886 2886
2887 try_wait_for_completion(&wm8962->fll_lock); 2887 try_wait_for_completion(&wm8962->fll_lock);
2888 2888
2889 pm_runtime_get_sync(codec->dev); 2889 ret = pm_runtime_get_sync(codec->dev);
2890 if (ret < 0) {
2891 dev_err(codec->dev, "Failed to resume device: %d\n", ret);
2892 return ret;
2893 }
2890 2894
2891 snd_soc_update_bits(codec, WM8962_FLL_CONTROL_1, 2895 snd_soc_update_bits(codec, WM8962_FLL_CONTROL_1,
2892 WM8962_FLL_FRAC | WM8962_FLL_REFCLK_SRC_MASK | 2896 WM8962_FLL_FRAC | WM8962_FLL_REFCLK_SRC_MASK |