aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMark Brown <broonie@opensource.wolfsonmicro.com>2010-09-27 20:20:11 -0400
committerMark Brown <broonie@opensource.wolfsonmicro.com>2010-09-28 17:10:18 -0400
commit61371126307ffabb9880e5a22e126b46df846b12 (patch)
tree82e275cc818211096668c79fd86eba0d23b1343e
parentd1454e6fbdf01056834018cfd12f9a066cfc0dd7 (diff)
ASoC: Fix masking of WM8962 FLL1 register
When configuring the FLL we preserve the FLL enable configuration in order to allow us to reenable the FLL after configuration but we do not clear the other bits in the register, causing old configuration to be preserved. Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com> Acked-by: Liam Girdwood <lrg@slimlogic.co.uk>
-rw-r--r--sound/soc/codecs/wm8962.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/sound/soc/codecs/wm8962.c b/sound/soc/codecs/wm8962.c
index 7de519479801..12286d6c708d 100644
--- a/sound/soc/codecs/wm8962.c
+++ b/sound/soc/codecs/wm8962.c
@@ -1342,7 +1342,7 @@ static int wm8962_set_fll(struct snd_soc_dai *dai, int fll_id, int source,
1342 struct wm8962_priv *wm8962 = snd_soc_codec_get_drvdata(codec); 1342 struct wm8962_priv *wm8962 = snd_soc_codec_get_drvdata(codec);
1343 struct _fll_div fll_div; 1343 struct _fll_div fll_div;
1344 int ret; 1344 int ret;
1345 int fll1 = snd_soc_read(codec, WM8962_FLL_CONTROL_1); 1345 int fll1 = snd_soc_read(codec, WM8962_FLL_CONTROL_1) & WM8962_FLL_ENA;
1346 1346
1347 /* Any change? */ 1347 /* Any change? */
1348 if (source == wm8962->fll_src && Fref == wm8962->fll_fref && 1348 if (source == wm8962->fll_src && Fref == wm8962->fll_fref &&