Skip to content

Commit

Permalink
ASoC: Fix masking of WM8962 FLL1 register
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Mark Brown committed Sep 28, 2010
1 parent d1454e6 commit 6137112
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion sound/soc/codecs/wm8962.c
Original file line number Diff line number Diff line change
Expand Up @@ -1342,7 +1342,7 @@ static int wm8962_set_fll(struct snd_soc_dai *dai, int fll_id, int source,
struct wm8962_priv *wm8962 = snd_soc_codec_get_drvdata(codec);
struct _fll_div fll_div;
int ret;
int fll1 = snd_soc_read(codec, WM8962_FLL_CONTROL_1);
int fll1 = snd_soc_read(codec, WM8962_FLL_CONTROL_1) & WM8962_FLL_ENA;

/* Any change? */
if (source == wm8962->fll_src && Fref == wm8962->fll_fref &&
Expand Down

0 comments on commit 6137112

Please sign in to comment.