summaryrefslogtreecommitdiff
path: root/sound/soc/codecs/wm8994.c
diff options
context:
space:
mode:
authorTakashi Iwai <tiwai@suse.de>2011-07-05 10:20:19 +0400
committerTakashi Iwai <tiwai@suse.de>2011-07-05 10:20:19 +0400
commitf187700c2d769bd3160b52f99cc4e747d5c5014b (patch)
treeef4abc21683423fa4a6405b954d06743ddbda24a /sound/soc/codecs/wm8994.c
parent56aa53391059e3730a304da4dd96b7b123b9fb75 (diff)
parentf1442bc1e9bd5ff4c2470d66075d066e535a2c86 (diff)
downloadlinux-f187700c2d769bd3160b52f99cc4e747d5c5014b.tar.xz
Merge branch 'for-3.1' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound-2.6 into topic/asoc
Diffstat (limited to 'sound/soc/codecs/wm8994.c')
-rw-r--r--sound/soc/codecs/wm8994.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/sound/soc/codecs/wm8994.c b/sound/soc/codecs/wm8994.c
index dc2350e6350b..70a68fd96c46 100644
--- a/sound/soc/codecs/wm8994.c
+++ b/sound/soc/codecs/wm8994.c
@@ -1713,6 +1713,8 @@ static int _wm8994_set_fll(struct snd_soc_codec *codec, int id, int src,
snd_soc_update_bits(codec, WM8994_FLL1_CONTROL_1 + reg_offset,
WM8994_FLL1_ENA | WM8994_FLL1_FRAC,
reg);
+
+ msleep(5);
}
wm8994->fll[id].in = freq_in;