diff options
author | Dimitris Papastamos <dp@opensource.wolfsonmicro.com> | 2011-01-14 10:59:13 -0500 |
---|---|---|
committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2011-01-17 09:09:44 -0500 |
commit | 7ebcf5d6021a696680ee77d9162a2edec2d671dd (patch) | |
tree | bea8d4ed05c8b520533243484a05c7d3746a3cfd /sound/soc | |
parent | 228dd545147a07c5e81e4732ad0e829d19ce5daa (diff) |
ASoC: WM8990: msleep() takes milliseconds not jiffies
Signed-off-by: Dimitris Papastamos <dp@opensource.wolfsonmicro.com>
Acked-by: Liam Girdwood <lrg@slimlogic.co.uk>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Cc: stable@kernel.org
Diffstat (limited to 'sound/soc')
-rw-r--r-- | sound/soc/codecs/wm8990.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/sound/soc/codecs/wm8990.c b/sound/soc/codecs/wm8990.c index 5c87a634fc04..100aeee5ba96 100644 --- a/sound/soc/codecs/wm8990.c +++ b/sound/soc/codecs/wm8990.c | |||
@@ -1183,7 +1183,7 @@ static int wm8990_set_bias_level(struct snd_soc_codec *codec, | |||
1183 | WM8990_VMIDTOG); | 1183 | WM8990_VMIDTOG); |
1184 | 1184 | ||
1185 | /* Delay to allow output caps to discharge */ | 1185 | /* Delay to allow output caps to discharge */ |
1186 | msleep(msecs_to_jiffies(300)); | 1186 | msleep(300); |
1187 | 1187 | ||
1188 | /* Disable VMIDTOG */ | 1188 | /* Disable VMIDTOG */ |
1189 | snd_soc_write(codec, WM8990_ANTIPOP2, WM8990_SOFTST | | 1189 | snd_soc_write(codec, WM8990_ANTIPOP2, WM8990_SOFTST | |
@@ -1195,17 +1195,17 @@ static int wm8990_set_bias_level(struct snd_soc_codec *codec, | |||
1195 | /* Enable outputs */ | 1195 | /* Enable outputs */ |
1196 | snd_soc_write(codec, WM8990_POWER_MANAGEMENT_1, 0x1b00); | 1196 | snd_soc_write(codec, WM8990_POWER_MANAGEMENT_1, 0x1b00); |
1197 | 1197 | ||
1198 | msleep(msecs_to_jiffies(50)); | 1198 | msleep(50); |
1199 | 1199 | ||
1200 | /* Enable VMID at 2x50k */ | 1200 | /* Enable VMID at 2x50k */ |
1201 | snd_soc_write(codec, WM8990_POWER_MANAGEMENT_1, 0x1f02); | 1201 | snd_soc_write(codec, WM8990_POWER_MANAGEMENT_1, 0x1f02); |
1202 | 1202 | ||
1203 | msleep(msecs_to_jiffies(100)); | 1203 | msleep(100); |
1204 | 1204 | ||
1205 | /* Enable VREF */ | 1205 | /* Enable VREF */ |
1206 | snd_soc_write(codec, WM8990_POWER_MANAGEMENT_1, 0x1f03); | 1206 | snd_soc_write(codec, WM8990_POWER_MANAGEMENT_1, 0x1f03); |
1207 | 1207 | ||
1208 | msleep(msecs_to_jiffies(600)); | 1208 | msleep(600); |
1209 | 1209 | ||
1210 | /* Enable BUFIOEN */ | 1210 | /* Enable BUFIOEN */ |
1211 | snd_soc_write(codec, WM8990_ANTIPOP2, WM8990_SOFTST | | 1211 | snd_soc_write(codec, WM8990_ANTIPOP2, WM8990_SOFTST | |
@@ -1250,7 +1250,7 @@ static int wm8990_set_bias_level(struct snd_soc_codec *codec, | |||
1250 | /* Disable VMID */ | 1250 | /* Disable VMID */ |
1251 | snd_soc_write(codec, WM8990_POWER_MANAGEMENT_1, 0x1f01); | 1251 | snd_soc_write(codec, WM8990_POWER_MANAGEMENT_1, 0x1f01); |
1252 | 1252 | ||
1253 | msleep(msecs_to_jiffies(300)); | 1253 | msleep(300); |
1254 | 1254 | ||
1255 | /* Enable all output discharge bits */ | 1255 | /* Enable all output discharge bits */ |
1256 | snd_soc_write(codec, WM8990_ANTIPOP1, WM8990_DIS_LLINE | | 1256 | snd_soc_write(codec, WM8990_ANTIPOP1, WM8990_DIS_LLINE | |