mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-09-05 02:19:51 +00:00
ALSA: isight: fix hang when unplugging a running device
When aborting a PCM stream, the xrun is signaled only if the stream is running. When disconnecting a PCM stream, calling snd_card_disconnect() too early would change the stream into a non-running state and thus prevent the xrun from being noticed by user space. To prevent this, move the snd_card_disconnect() call after the xrun. Signed-off-by: Clemens Ladisch <clemens@ladisch.de> Signed-off-by: Takashi Iwai <tiwai@suse.de>
This commit is contained in:
parent
ac34dad26e
commit
aee7040018
1 changed files with 1 additions and 2 deletions
|
@ -692,10 +692,9 @@ static int isight_remove(struct device *dev)
|
|||
{
|
||||
struct isight *isight = dev_get_drvdata(dev);
|
||||
|
||||
snd_card_disconnect(isight->card);
|
||||
|
||||
mutex_lock(&isight->mutex);
|
||||
isight_pcm_abort(isight);
|
||||
snd_card_disconnect(isight->card);
|
||||
isight_stop_streaming(isight);
|
||||
mutex_unlock(&isight->mutex);
|
||||
|
||||
|
|
Loading…
Reference in a new issue