Commit 10556d5c authored Dec 18, 2014 by Takashi Iwai Committed by Sasha Levin Mar 14, 2015

ALSA: pcm: Don't leave PREPARED state after draining



commit 70372a7566b5e552dbe48abdac08c275081d8558 upstream.

When a PCM draining is performed to an empty stream that has been
already in PREPARED state, the current code just ignores and leaves as
it is, although the drain is supposed to set all such streams to SETUP
state.  This patch covers that overlooked case.

Signed-off-by: Takashi Iwai <tiwai@suse.de>
Signed-off-by: Sasha Levin <sasha.levin@oracle.com>

parent d2d74ad4

sound/core/pcm_native.c

+2 −0

Original line number	Diff line number	Diff line
		@@ -1523,6 +1523,8 @@ static int snd_pcm_do_drain_init(struct snd_pcm_substream *substream, int state)
		if (! snd_pcm_playback_empty(substream)) {
		snd_pcm_do_start(substream, SNDRV_PCM_STATE_DRAINING);
		snd_pcm_post_start(substream, SNDRV_PCM_STATE_DRAINING);
		} else {
		runtime->status->state = SNDRV_PCM_STATE_SETUP;
		}
		break;
		case SNDRV_PCM_STATE_RUNNING: