From 63dbdecb9491fb9e1526df69a2371245762a9b2c Mon Sep 17 00:00:00 2001 From: Mark Brown Date: Sat, 3 Mar 2012 15:33:23 +0000 Subject: [PATCH] --- yaml --- r: 293438 b: refs/heads/master c: b16db745b51a1ecd3fd526a2ff35d61f2962bd7f h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/sound/soc/codecs/wm8994.c | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 99caf10ecbb6..d047488038fe 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 2bc16ed8e02ba39dc5010b4a2b2a606e4b87abbd +refs/heads/master: b16db745b51a1ecd3fd526a2ff35d61f2962bd7f diff --git a/trunk/sound/soc/codecs/wm8994.c b/trunk/sound/soc/codecs/wm8994.c index 73cd8b922d12..a567a4d9b5dc 100644 --- a/trunk/sound/soc/codecs/wm8994.c +++ b/trunk/sound/soc/codecs/wm8994.c @@ -1918,7 +1918,8 @@ static int _wm8994_set_fll(struct snd_soc_codec *codec, int id, int src, WM8994_FLL1_OUTDIV_MASK | WM8994_FLL1_FRATIO_MASK, reg); - snd_soc_write(codec, WM8994_FLL1_CONTROL_3 + reg_offset, fll.k); + snd_soc_update_bits(codec, WM8994_FLL1_CONTROL_3 + reg_offset, + WM8994_FLL1_K_MASK, fll.k); snd_soc_update_bits(codec, WM8994_FLL1_CONTROL_4 + reg_offset, WM8994_FLL1_N_MASK,