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

6980a317 · Mark Brown · b2776bf7 · 36fba62c · 6980a317
Commit 6980a317 authored Dec 08, 2014 by Mark Brown
Hide whitespace changes
Inline Side-by-side

Showing with 4 additions and 0 deletions

sound/soc/soc-pcm.c sound/soc/soc-pcm.c +4 -0

No files found.
--- a/sound/soc/soc-pcm.c
+++ b/sound/soc/soc-pcm.c
@@ -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) &&