ASoC: Fix active count tracking for CODEC to CODEC links

For CODEC to CODEC links we need to make sure to also manage the 'active' field
of the cpu_dai CODEC.

Signed-off-by: Lars-Peter Clausen <lars@metafoo.de>
Signed-off-by: Mark Brown <broonie@linaro.org>

diff --git a/sound/soc/soc-pcm.c b/sound/soc/soc-pcm.c
index 1a9857519d65577a1156d4349df17b3b7b909ab8..71a01dda1867e54dbd4de8a6c268501ebb60df4d 100644 (file)
--- a/sound/soc/soc-pcm.c
+++ b/sound/soc/soc-pcm.c
@@ -61,7 +61,9 @@ void snd_soc_runtime_activate(struct snd_soc_pcm_runtime *rtd, int stream)
 
        cpu_dai->active++;
        codec_dai->active++;
-       rtd->codec->active++;
+       if (cpu_dai->codec)
+               cpu_dai->codec->active++;
+       codec_dai->codec->active++;
 }
 
 /**
@@ -91,7 +93,9 @@ void snd_soc_runtime_deactivate(struct snd_soc_pcm_runtime *rtd, int stream)
 
        cpu_dai->active--;
        codec_dai->active--;
-       rtd->codec->active--;
+       if (cpu_dai->codec)
+               cpu_dai->codec->active--;
+       codec_dai->codec->active--;
 }
 
 /**