diff options
| author | Takashi Iwai <tiwai@suse.de> | 2012-11-07 12:44:13 +0100 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2012-11-17 13:14:22 -0800 |
| commit | 8a7173c58c8a1e25d7b2d572f045da837bb373bf (patch) | |
| tree | 1b16fcddcaffe247fc152ec187c7e439c8c43d6c /sound/core/pcm_native.c | |
| parent | 40edba667959559aa4385a5ec047420fcfeb5f03 (diff) | |
| download | kernel_samsung_smdk4412-8a7173c58c8a1e25d7b2d572f045da837bb373bf.zip kernel_samsung_smdk4412-8a7173c58c8a1e25d7b2d572f045da837bb373bf.tar.gz kernel_samsung_smdk4412-8a7173c58c8a1e25d7b2d572f045da837bb373bf.tar.bz2 | |
ALSA: Avoid endless sleep after disconnect
commit 0914f7961babbf28aaa2f19b453951fb4841c03f upstream.
When disconnect callback is called, each component should wake up
sleepers and check card->shutdown flag for avoiding the endless sleep
blocking the proper resource release.
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'sound/core/pcm_native.c')
| -rw-r--r-- | sound/core/pcm_native.c | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/sound/core/pcm_native.c b/sound/core/pcm_native.c index 4a3a5c0..c8e5a6b 100644 --- a/sound/core/pcm_native.c +++ b/sound/core/pcm_native.c @@ -1507,6 +1507,10 @@ static int snd_pcm_drain(struct snd_pcm_substream *substream, down_read(&snd_pcm_link_rwsem); snd_pcm_stream_lock_irq(substream); remove_wait_queue(&to_check->sleep, &wait); + if (card->shutdown) { + result = -ENODEV; + break; + } if (tout == 0) { if (substream->runtime->status->state == SNDRV_PCM_STATE_SUSPENDED) result = -ESTRPIPE; @@ -2158,6 +2162,10 @@ static int snd_pcm_open(struct file *file, struct snd_pcm *pcm, int stream) mutex_unlock(&pcm->open_mutex); schedule(); mutex_lock(&pcm->open_mutex); + if (pcm->card->shutdown) { + err = -ENODEV; + break; + } if (signal_pending(current)) { err = -ERESTARTSYS; break; |