Merge remote-tracking branch 'asoc/fix/pcm' into asoc-linus

This commit is contained in:
Mark Brown 2014-12-08 13:11:39 +00:00
commit 6980a31735
1 changed files with 4 additions and 0 deletions

View File

@ -1664,6 +1664,10 @@ int dpcm_be_dai_hw_free(struct snd_soc_pcm_runtime *fe, int stream)
if (!snd_soc_dpcm_can_be_free_stop(fe, be, stream))
continue;
/* do not free hw if this BE is used by other FE */
if (be->dpcm[stream].users > 1)
continue;
if ((be->dpcm[stream].state != SND_SOC_DPCM_STATE_HW_PARAMS) &&
(be->dpcm[stream].state != SND_SOC_DPCM_STATE_PREPARE) &&
(be->dpcm[stream].state != SND_SOC_DPCM_STATE_HW_FREE) &&