summaryrefslogtreecommitdiff
path: root/sound/firewire
diff options
context:
space:
mode:
authorClemens Ladisch <clemens@ladisch.de>2011-09-04 22:13:09 +0200
committerClemens Ladisch <clemens@ladisch.de>2013-10-20 22:07:57 +0200
commit4ed31f20bb5bb90f003c91734c6b9d18169ae27e (patch)
tree087b7c0e23a5c7eb8ce00e3d69c4d78186bc98f5 /sound/firewire
parente84d15f619c13e83b33023c84527ee35ef01b6b4 (diff)
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>
Diffstat (limited to 'sound/firewire')
-rw-r--r--sound/firewire/dice.c7
1 files changed, 5 insertions, 2 deletions
diff --git a/sound/firewire/dice.c b/sound/firewire/dice.c
index 63446f86cdd7..d0575a96ea70 100644
--- a/sound/firewire/dice.c
+++ b/sound/firewire/dice.c
@@ -1000,12 +1000,15 @@ static void dice_remove(struct fw_unit *unit)
{
struct dice *dice = dev_get_drvdata(&unit->device);
- snd_card_disconnect(dice->card);
-
mutex_lock(&dice->mutex);
+
amdtp_out_stream_pcm_abort(&dice->stream);
+
+ snd_card_disconnect(dice->card);
+
dice_stream_stop(dice);
dice_owner_clear(dice);
+
mutex_unlock(&dice->mutex);
snd_card_free_when_closed(dice->card);