Commit 930f403a authored by Takashi Iwai's avatar Takashi Iwai Committed by Linus Torvalds

[PATCH] alsa: fix sleep in atomic during prepare callback

Fixed the sleep in spinlock during prepare callback.  This happened only on
Nforce chips.
Signed-off-by: default avatarTakashi Iwai <tiwai@suse.de>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent a9a21593
...@@ -1020,7 +1020,9 @@ static void snd_intel8x0_setup_pcm_out(intel8x0_t *chip, ...@@ -1020,7 +1020,9 @@ static void snd_intel8x0_setup_pcm_out(intel8x0_t *chip,
*/ */
if (cnt & ICH_PCM_246_MASK) { if (cnt & ICH_PCM_246_MASK) {
iputdword(chip, ICHREG(GLOB_CNT), cnt & ~ICH_PCM_246_MASK); iputdword(chip, ICHREG(GLOB_CNT), cnt & ~ICH_PCM_246_MASK);
spin_unlock_irq(&chip->reg_lock);
msleep(50); /* grrr... */ msleep(50); /* grrr... */
spin_lock_irq(&chip->reg_lock);
} }
} else if (chip->device_type == DEVICE_INTEL_ICH4) { } else if (chip->device_type == DEVICE_INTEL_ICH4) {
if (runtime->sample_bits > 16) if (runtime->sample_bits > 16)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment