OpenE2K
/
linux
6
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

ALSA: dice: 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>
This commit is contained in:
Clemens Ladisch 2011-09-04 22:13:09 +02:00
parent e84d15f619
commit 4ed31f20bb
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
sound/firewire/dice.c
View File

@ -1000,12 +1000,15 @@ static void dice_remove(struct fw_unit *unit)
{
struct dice *dice = dev_get_drvdata(&unit->device);
mutex_lock(&dice->mutex);
amdtp_out_stream_pcm_abort(&dice->stream);
snd_card_disconnect(dice->card);
mutex_lock(&dice->mutex);
amdtp_out_stream_pcm_abort(&dice->stream);
dice_stream_stop(dice);
dice_owner_clear(dice);
mutex_unlock(&dice->mutex);
snd_card_free_when_closed(dice->card);