Commit 6ca73de7 authored Oct 11, 2017 by Takashi Iwai

ALSA: pcm: Forcibly stop at disconnect callback



So far we assumed that each driver implements the hotplug PCM handling
properly, e.g. dealing with the pending PCM stream at disconnect
callback.  But most codes don't care, and it eventually leaves the PCM
stream inconsistent state when an abrupt disconnection like sysfs
unbind happens.

This patch is simple but a big-hammer solution: invoke snd_pcm_stop()
at the common PCM disconnect callback always when the stream is
running.

Tested-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Signed-off-by: Takashi Iwai <tiwai@suse.de>

parent 8b645e4a

sound/core/pcm.c

+4 −0

Original line number	Diff line number	Diff line
		@@ -1154,6 +1154,10 @@ static int snd_pcm_dev_disconnect(struct snd_device *device)
		for (substream = pcm->streams[cidx].substream; substream; substream = substream->next) {
		snd_pcm_stream_lock_irq(substream);
		if (substream->runtime) {
		if (snd_pcm_running(substream))
		snd_pcm_stop(substream,
		SNDRV_PCM_STATE_DISCONNECTED);
		/* to be sure, set the state unconditionally */
		substream->runtime->status->state = SNDRV_PCM_STATE_DISCONNECTED;
		wake_up(&substream->runtime->sleep);
		wake_up(&substream->runtime->tsleep);

Admin message