aboutsummaryrefslogtreecommitdiffstats
path: root/sound/soc/codecs
diff options
context:
space:
mode:
authorTakashi Iwai <tiwai@suse.de>2011-07-05 08:20:00 +0200
committerTakashi Iwai <tiwai@suse.de>2011-07-05 08:20:00 +0200
commit8d9afa08fe831ae521bf11a125b347bb0b578526 (patch)
tree69f8cf880bcd4941760aefe2569f465e6ab75bf2 /sound/soc/codecs
parent63bc9750167ac765827470aa5aed1e79aeaaad9e (diff)
parent8e9ddf811ba021506d2316fcfe619faa0ab3f567 (diff)
downloadkernel_samsung_smdk4412-8d9afa08fe831ae521bf11a125b347bb0b578526.zip
kernel_samsung_smdk4412-8d9afa08fe831ae521bf11a125b347bb0b578526.tar.gz
kernel_samsung_smdk4412-8d9afa08fe831ae521bf11a125b347bb0b578526.tar.bz2
Merge branch 'for-3.0' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound-2.6 into fix/asoc
Diffstat (limited to 'sound/soc/codecs')
-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 970a95c..c2fc035 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;