Commit aee70400 authored by Clemens Ladisch's avatar Clemens Ladisch Committed by Takashi Iwai
Browse files

ALSA: isight: 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 <>
Signed-off-by: default avatarTakashi Iwai <>
parent ac34dad2
...@@ -692,10 +692,9 @@ static int isight_remove(struct device *dev) ...@@ -692,10 +692,9 @@ static int isight_remove(struct device *dev)
{ {
struct isight *isight = dev_get_drvdata(dev); struct isight *isight = dev_get_drvdata(dev);
mutex_lock(&isight->mutex); mutex_lock(&isight->mutex);
isight_pcm_abort(isight); isight_pcm_abort(isight);
isight_stop_streaming(isight); isight_stop_streaming(isight);
mutex_unlock(&isight->mutex); mutex_unlock(&isight->mutex);
Supports Markdown
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