summaryrefslogtreecommitdiffstats
path: root/sound/core
diff options
context:
space:
mode:
authorTakashi Iwai <tiwai@suse.de>2015-03-06 14:25:27 +0100
committerTakashi Iwai <tiwai@suse.de>2015-03-06 14:25:27 +0100
commita52afea68f94d2501b7fe1fa18cc6acf84e35a76 (patch)
tree977eb066b9de1bea4e7ce7ea9a5583d00279061f /sound/core
parent8b28c93fe5a55873ce22b7126e84eb59290f8603 (diff)
parentd7e3281b52fea8917fb4a7a5b09df5e6a9d2850c (diff)
downloadlinux-a52afea68f94d2501b7fe1fa18cc6acf84e35a76.tar.bz2
Merge tag 'asoc-v4.1' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into for-next
ASoC: Changes for v4.1 A selection of changes for v4.1 so far. The main things are: - Move of jack registration to the card where it belongs. - Support for DAPM routes specified by both the machine driver and DT.
Diffstat (limited to 'sound/core')
-rw-r--r--sound/core/pcm_native.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/sound/core/pcm_native.c b/sound/core/pcm_native.c
index 9c2c6f801fed..abe1e811e660 100644
--- a/sound/core/pcm_native.c
+++ b/sound/core/pcm_native.c
@@ -1585,6 +1585,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: