Skip to content

Commit

Permalink
ALSA: isight: fix hang when unplugging a running device
Browse files Browse the repository at this point in the history
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 <[email protected]>
Signed-off-by: Takashi Iwai <[email protected]>
  • Loading branch information
cladisch authored and tiwai committed May 11, 2011
1 parent ac34dad commit aee7040
Showing 1 changed file with 1 addition and 2 deletions.
3 changes: 1 addition & 2 deletions sound/firewire/isight.c
Original file line number Diff line number Diff line change
Expand Up @@ -692,10 +692,9 @@ static int isight_remove(struct device *dev)
{
struct isight *isight = dev_get_drvdata(dev);

snd_card_disconnect(isight->card);

mutex_lock(&isight->mutex);
isight_pcm_abort(isight);
snd_card_disconnect(isight->card);
isight_stop_streaming(isight);
mutex_unlock(&isight->mutex);

Expand Down

0 comments on commit aee7040

Please sign in to comment.