diff options
| author | Takashi Iwai <tiwai@suse.de> | 2011-07-05 02:20:00 -0400 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2011-07-05 02:20:00 -0400 |
| commit | 8d9afa08fe831ae521bf11a125b347bb0b578526 (patch) | |
| tree | 69f8cf880bcd4941760aefe2569f465e6ab75bf2 /sound/soc/codecs | |
| parent | 63bc9750167ac765827470aa5aed1e79aeaaad9e (diff) | |
| parent | 8e9ddf811ba021506d2316fcfe619faa0ab3f567 (diff) | |
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.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/sound/soc/codecs/wm8994.c b/sound/soc/codecs/wm8994.c index 970a95c5360b..c2fc0356c2a4 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, | |||
| 1713 | snd_soc_update_bits(codec, WM8994_FLL1_CONTROL_1 + reg_offset, | 1713 | snd_soc_update_bits(codec, WM8994_FLL1_CONTROL_1 + reg_offset, |
| 1714 | WM8994_FLL1_ENA | WM8994_FLL1_FRAC, | 1714 | WM8994_FLL1_ENA | WM8994_FLL1_FRAC, |
| 1715 | reg); | 1715 | reg); |
| 1716 | |||
| 1717 | msleep(5); | ||
| 1716 | } | 1718 | } |
| 1717 | 1719 | ||
| 1718 | wm8994->fll[id].in = freq_in; | 1720 | wm8994->fll[id].in = freq_in; |