diff options
| author | Takashi Iwai <tiwai@suse.de> | 2014-12-18 10:02:41 +0100 |
|---|---|---|
| committer | Ben Hutchings <ben@decadent.org.uk> | 2015-05-09 23:16:20 +0100 |
| commit | 535939674b0534168550344ad052587cc076de69 (patch) | |
| tree | adcb11b739520271bf1e9ca9464522e98a414848 /sound | |
| parent | 974c554a808b30effcc2a2b235b3bd2a75f173ce (diff) | |
| download | kernel_samsung_smdk4412-535939674b0534168550344ad052587cc076de69.zip kernel_samsung_smdk4412-535939674b0534168550344ad052587cc076de69.tar.gz kernel_samsung_smdk4412-535939674b0534168550344ad052587cc076de69.tar.bz2 | |
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: Ben Hutchings <ben@decadent.org.uk>
Diffstat (limited to 'sound')
| -rw-r--r-- | sound/core/pcm_native.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/sound/core/pcm_native.c b/sound/core/pcm_native.c index 638600b..8a00555 100644 --- a/sound/core/pcm_native.c +++ b/sound/core/pcm_native.c @@ -1382,6 +1382,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: |