summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorLiam Girdwood <lrg@slimlogic.co.uk>2010-09-24 01:35:50 +0100
committerSebastien Jan <s-jan@ti.com>2010-11-03 15:57:57 +0100
commitb8a7b97b147cee8653a4a0a6021c5d0e57ad5434 (patch)
treec7f5c162a97e630e42a56e3ac0a10ecdee0ea622 /include
parentedb7448260f936c8dede4c0ddfb974360797d62f (diff)
ASoC: core - make BE ref counting per stream
BE ref-counting must be carried out per stream direction to ensure we switch off *only* the correct BE DAIs. Signed-off-by: Liam Girdwood <lrg@slimlogic.co.uk> Signed-off-by: Margarita Olaya Cabrera <magi.olaya@ti.com>
Diffstat (limited to 'include')
-rw-r--r--include/sound/soc-dapm.h2
-rw-r--r--include/sound/soc.h4
2 files changed, 3 insertions, 3 deletions
diff --git a/include/sound/soc-dapm.h b/include/sound/soc-dapm.h
index 9ee8aa577710..e40d5906bf5e 100644
--- a/include/sound/soc-dapm.h
+++ b/include/sound/soc-dapm.h
@@ -338,7 +338,7 @@ const char *snd_soc_dapm_get_aif(struct snd_soc_dapm_context *dapm,
/* dapm events */
int snd_soc_dapm_stream_event(struct snd_soc_pcm_runtime *rtd,
- const char *stream, int event);
+ int dir, const char *stream, int event);
void snd_soc_dapm_shutdown(struct snd_soc_card *card);
/* external DAPM widget events */
diff --git a/include/sound/soc.h b/include/sound/soc.h
index a05b879f6b45..f6f39ab60189 100644
--- a/include/sound/soc.h
+++ b/include/sound/soc.h
@@ -658,9 +658,9 @@ struct snd_soc_pcm_runtime {
/* BE runtime data */
unsigned int fe_clients;
- unsigned int num_be;
+ unsigned int num_be[2];
unsigned int be_active;
- struct snd_soc_pcm_runtime *be_rtd[SND_SOC_MAX_BE];
+ struct snd_soc_pcm_runtime *be_rtd[SND_SOC_MAX_BE][2];
/* Symmetry data - only valid if symmetry is being enforced */
unsigned int rate;