Commit 4ed31f20 authored by Clemens Ladisch's avatar Clemens Ladisch

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: default avatarClemens Ladisch <clemens@ladisch.de>
parent e84d15f6
...@@ -1000,12 +1000,15 @@ static void dice_remove(struct fw_unit *unit) ...@@ -1000,12 +1000,15 @@ static void dice_remove(struct fw_unit *unit)
{ {
struct dice *dice = dev_get_drvdata(&unit->device); struct dice *dice = dev_get_drvdata(&unit->device);
snd_card_disconnect(dice->card);
mutex_lock(&dice->mutex); mutex_lock(&dice->mutex);
amdtp_out_stream_pcm_abort(&dice->stream); amdtp_out_stream_pcm_abort(&dice->stream);
snd_card_disconnect(dice->card);
dice_stream_stop(dice); dice_stream_stop(dice);
dice_owner_clear(dice); dice_owner_clear(dice);
mutex_unlock(&dice->mutex); mutex_unlock(&dice->mutex);
snd_card_free_when_closed(dice->card); snd_card_free_when_closed(dice->card);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment