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/control.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/control.c')
| -rw-r--r-- | sound/core/control.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/sound/core/control.c b/sound/core/control.c index 520a556..ce46a9e 100644 --- a/sound/core/control.c +++ b/sound/core/control.c @@ -1363,6 +1363,8 @@ static ssize_t snd_ctl_read(struct file *file, char __user *buffer, spin_unlock_irq(&ctl->read_lock); schedule(); remove_wait_queue(&ctl->change_sleep, &wait); + if (ctl->card->shutdown) + return -ENODEV; if (signal_pending(current)) return -ERESTARTSYS; spin_lock_irq(&ctl->read_lock); |