diff options
| author | Takashi Iwai <tiwai@suse.de> | 2019-06-13 17:33:34 +0200 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2019-06-13 17:33:34 +0200 |
| commit | 84396d141894c52f55c1276630587862f5ced7dd (patch) | |
| tree | 444043322d1afe7502b8bad825c0097502a83ddb /sound/soc/soc-pcm.c | |
| parent | 352bcae97f9ba87801f497571cdec20af190efe1 (diff) | |
| parent | 3da428ff2aa5a5191ba2f1630eea75f03242f3f2 (diff) | |
Merge tag 'asoc-fix-v5.2-rc4' of https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into for-linus
ASoC: Fixes for v5.2
There's an awful lot of fixes here, almost all for the newly introduced
SoF DSP drivers (including a few things it turned up in shared code).
This is a large and complex piece of code so it's not surprising that
there have been quite a few issues here, fortunately things seem to have
mostly calmed down now. Otherwise there's just a smattering of small fixes.
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 0a4f60c7a188..c46ad0f66292 100644 --- a/sound/soc/soc-pcm.c +++ b/sound/soc/soc-pcm.c @@ -2479,7 +2479,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", |