Commit 6ff67461 authored Mar 30, 2011 by Clemens Ladisch Committed by Takashi Iwai Mar 30, 2011

ALSA: firewire-speakers: 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>
Signed-off-by: Takashi Iwai <tiwai@suse.de>

parent c6b35874

sound/firewire/speakers.c

+1 −2

Original line number	Diff line number	Diff line
		@@ -778,10 +778,9 @@ static int __devexit fwspk_remove(struct device *dev)
		{
		struct fwspk *fwspk = dev_get_drvdata(dev);

		snd_card_disconnect(fwspk->card);

		mutex_lock(&fwspk->mutex);
		amdtp_out_stream_pcm_abort(&fwspk->stream);
		snd_card_disconnect(fwspk->card);
		fwspk_stop_stream(fwspk);
		mutex_unlock(&fwspk->mutex);