diff options
| author | Liam Girdwood <lrg@slimlogic.co.uk> | 2011-05-31 09:22:51 +0100 |
|---|---|---|
| committer | Andy Green <andy.green@linaro.org> | 2011-05-31 11:03:03 +0100 |
| commit | ad818ef3ece5feb020ae42639388ec62f9e418bf (patch) | |
| tree | 1680a18da3d5d6fcbae6726342543762b5a89157 /include | |
| parent | a19933d4c119b66a54b936143e61b311c85fd553 (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.
Change-Id: I727f608a3ca7c91d18b6a6587e9b696fb8d4e68a
Signed-off-by: Liam Girdwood <lrg@slimlogic.co.uk>
Signed-off-by: Margarita Olaya Cabrera <magi.olaya@ti.com>
Signed-off-by: Misael Lopez Cruz <misael.lopez@ti.com>
Diffstat (limited to 'include')
| -rw-r--r-- | include/sound/soc-dapm.h | 2 | ||||
| -rw-r--r-- | include/sound/soc.h | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/include/sound/soc-dapm.h b/include/sound/soc-dapm.h index e2fe6b20aec..b45ca9bfca4 100644 --- a/include/sound/soc-dapm.h +++ b/include/sound/soc-dapm.h @@ -349,7 +349,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 4c53514de8e..09057197b77 100644 --- a/include/sound/soc.h +++ b/include/sound/soc.h @@ -736,9 +736,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; |