Commit 4ed31f20 authored Sep 04, 2011 by 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: Clemens Ladisch <clemens@ladisch.de>

parent e84d15f6

sound/firewire/dice.c

+5 −2

Original line number	Diff line number	Diff line
		@@ -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);