From: Axel Lin Date: Sat, 22 Oct 2011 14:48:27 +0000 (+0800) Subject: ASoC: wm8400: Fix setting Fout clock divider for FLL Control 4 X-Git-Tag: next-20111109~28^2~1^2~33 X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=1d533de998e2887f23c8cf6c39d5db55f8d202af;p=karo-tx-linux.git ASoC: wm8400: Fix setting Fout clock divider for FLL Control 4 What we want here is to clear the WM8400_FLL_OUTDIV_MASK bits then OR with factors.outdiv. Signed-off-by: Axel Lin Acked-by: Liam Girdwood Signed-off-by: Mark Brown --- diff --git a/sound/soc/codecs/wm8400.c b/sound/soc/codecs/wm8400.c index dc13be2a09c5..f29bc26ba416 100644 --- a/sound/soc/codecs/wm8400.c +++ b/sound/soc/codecs/wm8400.c @@ -1059,7 +1059,7 @@ static int wm8400_set_dai_pll(struct snd_soc_dai *codec_dai, int pll_id, wm8400_write(codec, WM8400_FLL_CONTROL_3, factors.n); reg = wm8400_read(codec, WM8400_FLL_CONTROL_4); - reg &= WM8400_FLL_OUTDIV_MASK; + reg &= ~WM8400_FLL_OUTDIV_MASK; reg |= factors.outdiv; wm8400_write(codec, WM8400_FLL_CONTROL_4, reg);