Commit 4b95ff78 authored May 24, 2016 by Takashi Iwai

ALSA: pcm: Allow dropping stream directly after resume



So far, the PCM core refuses DROP ioctl when the stream in the
suspended state.  This was basically to avoid the invalid state change
*during* the suspend.  But since we protect the power change globally
in the common PCM ioctl caller side, it's guaranteed that
snd_pcm_drop() is called at the right power state.  So we can assume
that the drop of stream is safe immediately after SUSPENDED state.

Reviewed-by: Takashi Sakamoto <o-takashi@sakamocchi.jp>
Signed-off-by: Takashi Iwai <tiwai@suse.de>

parent 68b4acd3

sound/core/pcm_native.c

+1 −2

Original line number	Diff line number	Diff line
		@@ -1883,8 +1883,7 @@ static int snd_pcm_drop(struct snd_pcm_substream *substream)
		runtime = substream->runtime;

		if (runtime->status->state == SNDRV_PCM_STATE_OPEN \|\|
		runtime->status->state == SNDRV_PCM_STATE_DISCONNECTED \|\|
		runtime->status->state == SNDRV_PCM_STATE_SUSPENDED)
		runtime->status->state == SNDRV_PCM_STATE_DISCONNECTED)
		return -EBADFD;

		snd_pcm_stream_lock_irq(substream);

Admin message