diff options
author | Clemens Ladisch <clemens@ladisch.de> | 2011-09-04 20:13:09 (GMT) |
---|---|---|
committer | Clemens Ladisch <clemens@ladisch.de> | 2013-10-20 20:07:57 (GMT) |
commit | 4ed31f20bb5bb90f003c91734c6b9d18169ae27e (patch) | |
tree | 087b7c0e23a5c7eb8ce00e3d69c4d78186bc98f5 | |
parent | e84d15f619c13e83b33023c84527ee35ef01b6b4 (diff) | |
download | linux-4ed31f20bb5bb90f003c91734c6b9d18169ae27e.tar.xz |
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>
-rw-r--r-- | sound/firewire/dice.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/sound/firewire/dice.c b/sound/firewire/dice.c index 63446f8..d0575a9 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); |