diff options
| author | Clemens Ladisch <clemens@ladisch.de> | 2011-03-30 08:24:00 +0200 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2011-03-30 08:56:57 +0200 |
| commit | 6ff674615c91d942e4cfb4880c14733b616c9032 (patch) | |
| tree | d63d4a206fec0c7b917643afb65f36e5a5795dd4 /sound/firewire | |
| parent | c6b358748e19ce7e230b0926ac42696bc485a562 (diff) | |
| download | linux-3.10-6ff674615c91d942e4cfb4880c14733b616c9032.tar.gz linux-3.10-6ff674615c91d942e4cfb4880c14733b616c9032.tar.bz2 linux-3.10-6ff674615c91d942e4cfb4880c14733b616c9032.zip | |
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>
Diffstat (limited to 'sound/firewire')
| -rw-r--r-- | sound/firewire/speakers.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/sound/firewire/speakers.c b/sound/firewire/speakers.c index 0fce9218abb..5466de8527b 100644 --- a/sound/firewire/speakers.c +++ b/sound/firewire/speakers.c @@ -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); |