aboutsummaryrefslogtreecommitdiffstats
path: root/sound/isa
diff options
context:
space:
mode:
authorLi, Zhen-Hua <zhen-hual@hp.com>2014-04-14 05:41:32 -0400
committerTakashi Iwai <tiwai@suse.de>2014-04-14 08:27:27 -0400
commit5e0c1879919195b79a0b19feda9aafcb7a3e77e7 (patch)
treef4253801e70ee7b48df09eb961d8c60f5abbe014 /sound/isa
parent7c66593286bcd153e4868383e675673a27071bd5 (diff)
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>
Diffstat (limited to 'sound/isa')
-rw-r--r--sound/isa/es18xx.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/sound/isa/es18xx.c b/sound/isa/es18xx.c
index 1c16830af3d8..6faaac60161a 100644
--- a/sound/isa/es18xx.c
+++ b/sound/isa/es18xx.c
@@ -520,7 +520,7 @@ static int snd_es18xx_playback1_trigger(struct snd_es18xx *chip,
520 snd_es18xx_mixer_write(chip, 0x78, 0x93); 520 snd_es18xx_mixer_write(chip, 0x78, 0x93);
521#ifdef AVOID_POPS 521#ifdef AVOID_POPS
522 /* Avoid pops */ 522 /* Avoid pops */
523 udelay(100000); 523 mdelay(100);
524 if (chip->caps & ES18XX_PCM2) 524 if (chip->caps & ES18XX_PCM2)
525 /* Restore Audio 2 volume */ 525 /* Restore Audio 2 volume */
526 snd_es18xx_mixer_write(chip, 0x7C, chip->audio2_vol); 526 snd_es18xx_mixer_write(chip, 0x7C, chip->audio2_vol);
@@ -537,7 +537,7 @@ static int snd_es18xx_playback1_trigger(struct snd_es18xx *chip,
537 /* Stop DMA */ 537 /* Stop DMA */
538 snd_es18xx_mixer_write(chip, 0x78, 0x00); 538 snd_es18xx_mixer_write(chip, 0x78, 0x00);
539#ifdef AVOID_POPS 539#ifdef AVOID_POPS
540 udelay(25000); 540 mdelay(25);
541 if (chip->caps & ES18XX_PCM2) 541 if (chip->caps & ES18XX_PCM2)
542 /* Set Audio 2 volume to 0 */ 542 /* Set Audio 2 volume to 0 */
543 snd_es18xx_mixer_write(chip, 0x7C, 0); 543 snd_es18xx_mixer_write(chip, 0x7C, 0);
@@ -596,7 +596,7 @@ static int snd_es18xx_capture_prepare(struct snd_pcm_substream *substream)
596 snd_es18xx_write(chip, 0xA5, count >> 8); 596 snd_es18xx_write(chip, 0xA5, count >> 8);
597 597
598#ifdef AVOID_POPS 598#ifdef AVOID_POPS
599 udelay(100000); 599 mdelay(100);
600#endif 600#endif
601 601
602 /* Set format */ 602 /* Set format */
@@ -691,7 +691,7 @@ static int snd_es18xx_playback2_trigger(struct snd_es18xx *chip,
691 snd_es18xx_write(chip, 0xB8, 0x05); 691 snd_es18xx_write(chip, 0xB8, 0x05);
692#ifdef AVOID_POPS 692#ifdef AVOID_POPS
693 /* Avoid pops */ 693 /* Avoid pops */
694 udelay(100000); 694 mdelay(100);
695 /* Enable Audio 1 */ 695 /* Enable Audio 1 */
696 snd_es18xx_dsp_command(chip, 0xD1); 696 snd_es18xx_dsp_command(chip, 0xD1);
697#endif 697#endif
@@ -705,7 +705,7 @@ static int snd_es18xx_playback2_trigger(struct snd_es18xx *chip,
705 snd_es18xx_write(chip, 0xB8, 0x00); 705 snd_es18xx_write(chip, 0xB8, 0x00);
706#ifdef AVOID_POPS 706#ifdef AVOID_POPS
707 /* Avoid pops */ 707 /* Avoid pops */
708 udelay(25000); 708 mdelay(25);
709 /* Disable Audio 1 */ 709 /* Disable Audio 1 */
710 snd_es18xx_dsp_command(chip, 0xD3); 710 snd_es18xx_dsp_command(chip, 0xD3);
711#endif 711#endif