diff options
| author | Liam Girdwood <liam.r.girdwood@linux.intel.com> | 2014-01-07 17:51:42 +0000 |
|---|---|---|
| committer | Mark Brown <broonie@linaro.org> | 2014-01-07 17:57:48 +0000 |
| commit | 1e9de42f4324b91ce2e9da0939cab8fc6ae93893 (patch) | |
| tree | d482178030e7a5c78fc8b7c1f48724446358fcc1 /sound | |
| parent | 6ce4eac1f600b34f2f7f58f9cd8f0503d79e42ae (diff) | |
| download | linux-stable-1e9de42f4324b91ce2e9da0939cab8fc6ae93893.tar.gz linux-stable-1e9de42f4324b91ce2e9da0939cab8fc6ae93893.tar.bz2 linux-stable-1e9de42f4324b91ce2e9da0939cab8fc6ae93893.zip | |
ASoC: dpcm: Explicitly set BE DAI link supported stream directions
Some BE DAIs can be "dummy" (when the DSP is controlling the DAI) and as such
wont have set a minimum number of playback or capture channels required for BE
DAI registration (to establish supported stream directions).
Force machine drivers to explicitly set whether they support playback and capture
stream directions for every BE DAIs.
Signed-off-by: Liam Girdwood <liam.r.girdwood@linux.intel.com>
Signed-off-by: Mark Brown <broonie@linaro.org>
Diffstat (limited to 'sound')
| -rw-r--r-- | sound/soc/soc-pcm.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/sound/soc/soc-pcm.c b/sound/soc/soc-pcm.c index 42782c01e413..141a302e4e77 100644 --- a/sound/soc/soc-pcm.c +++ b/sound/soc/soc-pcm.c @@ -2026,10 +2026,8 @@ int soc_new_pcm(struct snd_soc_pcm_runtime *rtd, int num) int ret = 0, playback = 0, capture = 0; if (rtd->dai_link->dynamic || rtd->dai_link->no_pcm) { - if (cpu_dai->driver->playback.channels_min) - playback = 1; - if (cpu_dai->driver->capture.channels_min) - capture = 1; + playback = rtd->dai_link->dpcm_playback; + capture = rtd->dai_link->dpcm_capture; } else { if (codec_dai->driver->playback.channels_min && cpu_dai->driver->playback.channels_min) |