diff options
| author | Jaroslav Kysela <perex@suse.cz> | 2004-04-24 19:59:07 +0200 |
|---|---|---|
| committer | Jaroslav Kysela <perex@suse.cz> | 2004-04-24 19:59:07 +0200 |
| commit | 4f50f5280ef82e394c6ebeecad3b2c89df0a257f (patch) | |
| tree | 470728ffb0fabdca54f4309b5fc829336f2c0de7 /sound | |
| parent | 5313460f74cfde8804e33a1759ff0528e39799da (diff) | |
| download | history-4f50f5280ef82e394c6ebeecad3b2c89df0a257f.tar.gz | |
ALSA CVS update - Takashi Iwai <tiwai@suse.de>
PCM Midlevel
fixed the deadlock of power_lock in suspend (by Terry Loftin)
Diffstat (limited to 'sound')
| -rw-r--r-- | sound/core/pcm_native.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sound/core/pcm_native.c b/sound/core/pcm_native.c index 6de6af46611a3..0c913201d6984 100644 --- a/sound/core/pcm_native.c +++ b/sound/core/pcm_native.c @@ -1038,7 +1038,7 @@ static int snd_pcm_resume(snd_pcm_substream_t *substream) snd_power_lock(card); if ((res = snd_power_wait(card, SNDRV_CTL_POWER_D0, substream->ffile)) >= 0) - return snd_pcm_action_lock_irq(&snd_pcm_action_resume, substream, 0, 0); + res = snd_pcm_action_lock_irq(&snd_pcm_action_resume, substream, 0, 0); snd_power_unlock(card); return res; } |