diff options
| author | Mark Brown | 2019-05-21 23:00:33 +0200 |
|---|---|---|
| committer | Mark Brown | 2019-05-21 23:00:33 +0200 |
| commit | a41016e40378d19f7c9ced61856b8bed866e2dda (patch) | |
| tree | d82aeb3f14ff95791ff165813fee90d3916df0aa /sound/soc/soc-pcm.c | |
| parent | ASoC: soc-pcm: fixup try_module_get()/module_put() timing (diff) | |
| parent | ASoC: Intel: sof-rt5682: fix AMP quirk support (diff) | |
| download | kernel-qcow2-linux-a41016e40378d19f7c9ced61856b8bed866e2dda.tar.gz kernel-qcow2-linux-a41016e40378d19f7c9ced61856b8bed866e2dda.tar.xz kernel-qcow2-linux-a41016e40378d19f7c9ced61856b8bed866e2dda.zip | |
Merge branch 'for-5.2' of https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into asoc-5.3
Diffstat (limited to 'sound/soc/soc-pcm.c')
| -rw-r--r-- | sound/soc/soc-pcm.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/sound/soc/soc-pcm.c b/sound/soc/soc-pcm.c index 4a7096a22b28..4878d22ebd8c 100644 --- a/sound/soc/soc-pcm.c +++ b/sound/soc/soc-pcm.c @@ -2495,7 +2495,8 @@ int dpcm_be_dai_prepare(struct snd_soc_pcm_runtime *fe, int stream) if ((be->dpcm[stream].state != SND_SOC_DPCM_STATE_HW_PARAMS) && (be->dpcm[stream].state != SND_SOC_DPCM_STATE_STOP) && - (be->dpcm[stream].state != SND_SOC_DPCM_STATE_SUSPEND)) + (be->dpcm[stream].state != SND_SOC_DPCM_STATE_SUSPEND) && + (be->dpcm[stream].state != SND_SOC_DPCM_STATE_PAUSED)) continue; dev_dbg(be->dev, "ASoC: prepare BE %s\n", |