microsoft
/
WSL2-Linux-Kernel
зеркало из https://github.com/microsoft/WSL2-Linux-Kernel.git
1
0
Форкнуть 0
Код Задачи Пакеты Проекты Релизы Вики Активность

ALSA: es18xx driver should use udelay error 

udelay with more than 20000 may cause __bad_udelay.
Use mdelay for instead.

[fixed a typo spotted by Clemens -- tiwai]

Signed-off-by: Li, Zhen-Hua <zhen-hual@hp.com>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
This commit is contained in:
Li, Zhen-Hua 2014-04-14 17:41:32 +08:00 коммит произвёл Takashi Iwai
Родитель 7c66593286
Коммит 5e0c187991
1 изменённых файлов: 5 добавлений и 5 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

10
sound/isa/es18xx.c
Просмотреть файл

@ -520,7 +520,7 @@ static int snd_es18xx_playback1_trigger(struct snd_es18xx *chip,
snd_es18xx_mixer_write(chip, 0x78, 0x93); snd_es18xx_mixer_write(chip, 0x78, 0x93);
#ifdef AVOID_POPS #ifdef AVOID_POPS
/* Avoid pops */ /* Avoid pops */
udelay(100000); mdelay(100);
if (chip->caps & ES18XX_PCM2) if (chip->caps & ES18XX_PCM2)
/* Restore Audio 2 volume */ /* Restore Audio 2 volume */
snd_es18xx_mixer_write(chip, 0x7C, chip->audio2_vol); snd_es18xx_mixer_write(chip, 0x7C, chip->audio2_vol);
@ -537,7 +537,7 @@ static int snd_es18xx_playback1_trigger(struct snd_es18xx *chip,
/* Stop DMA */ /* Stop DMA */
snd_es18xx_mixer_write(chip, 0x78, 0x00); snd_es18xx_mixer_write(chip, 0x78, 0x00);
#ifdef AVOID_POPS #ifdef AVOID_POPS
udelay(25000); mdelay(25);
if (chip->caps & ES18XX_PCM2) if (chip->caps & ES18XX_PCM2)
/* Set Audio 2 volume to 0 */ /* Set Audio 2 volume to 0 */
snd_es18xx_mixer_write(chip, 0x7C, 0); snd_es18xx_mixer_write(chip, 0x7C, 0);
@ -596,7 +596,7 @@ static int snd_es18xx_capture_prepare(struct snd_pcm_substream *substream)
snd_es18xx_write(chip, 0xA5, count >> 8); snd_es18xx_write(chip, 0xA5, count >> 8);
#ifdef AVOID_POPS #ifdef AVOID_POPS
udelay(100000); mdelay(100);
#endif #endif
/* Set format */ /* Set format */
@ -691,7 +691,7 @@ static int snd_es18xx_playback2_trigger(struct snd_es18xx *chip,
snd_es18xx_write(chip, 0xB8, 0x05); snd_es18xx_write(chip, 0xB8, 0x05);
#ifdef AVOID_POPS #ifdef AVOID_POPS
/* Avoid pops */ /* Avoid pops */
udelay(100000); mdelay(100);
/* Enable Audio 1 */ /* Enable Audio 1 */
snd_es18xx_dsp_command(chip, 0xD1); snd_es18xx_dsp_command(chip, 0xD1);
#endif #endif
@ -705,7 +705,7 @@ static int snd_es18xx_playback2_trigger(struct snd_es18xx *chip,
snd_es18xx_write(chip, 0xB8, 0x00); snd_es18xx_write(chip, 0xB8, 0x00);
#ifdef AVOID_POPS #ifdef AVOID_POPS
/* Avoid pops */ /* Avoid pops */
udelay(25000); mdelay(25);
/* Disable Audio 1 */ /* Disable Audio 1 */
snd_es18xx_dsp_command(chip, 0xD3); snd_es18xx_dsp_command(chip, 0xD3);
#endif #endif