openkylin
/
platform_kernel-5.15
mirror of https://gitee.com/openkylin/platform_kernel-5.15.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

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:
Clemens Ladisch 2011-05-11 10:53:12 +02:00 committed by Takashi Iwai
parent ac34dad26e
commit aee7040018
1 changed files with 1 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
sound/firewire/isight.c
View File

@ -692,10 +692,9 @@ static int isight_remove(struct device *dev)
{ {
struct isight *isight = dev_get_drvdata(dev); struct isight *isight = dev_get_drvdata(dev);
snd_card_disconnect(isight->card);
mutex_lock(&isight->mutex); mutex_lock(&isight->mutex);
isight_pcm_abort(isight); isight_pcm_abort(isight);
snd_card_disconnect(isight->card);
isight_stop_streaming(isight); isight_stop_streaming(isight);
mutex_unlock(&isight->mutex); mutex_unlock(&isight->mutex);