summaryrefslogtreecommitdiffstats
path: root/sound/soc/soc-pcm.c
diff options
context:
space:
mode:
authorMark Brown <broonie@linaro.org>2013-09-01 21:15:52 +0100
committerMark Brown <broonie@linaro.org>2013-09-01 21:15:52 +0100
commit90d561bed9619fc08c31eab9315ebe811d41149a (patch)
tree990181e26f309543db6fd4d8797d5bcabdae37b6 /sound/soc/soc-pcm.c
parent59a3aed73bd61616df2f40700b7783dcdc7414fd (diff)
parenta90e6053baa61feed8b19a9f4cbec6b56479d1ba (diff)
downloadlinux-90d561bed9619fc08c31eab9315ebe811d41149a.tar.gz
linux-90d561bed9619fc08c31eab9315ebe811d41149a.tar.bz2
linux-90d561bed9619fc08c31eab9315ebe811d41149a.zip
Merge remote-tracking branch 'asoc/topic/fsl' into tmp
Diffstat (limited to 'sound/soc/soc-pcm.c')
-rw-r--r--sound/soc/soc-pcm.c10
1 files changed, 10 insertions, 0 deletions
diff --git a/sound/soc/soc-pcm.c b/sound/soc/soc-pcm.c
index fb70fbe26862..330c9a6b5cb5 100644
--- a/sound/soc/soc-pcm.c
+++ b/sound/soc/soc-pcm.c
@@ -2020,6 +2020,16 @@ int soc_new_pcm(struct snd_soc_pcm_runtime *rtd, int num)
capture = 1;
}
+ if (rtd->dai_link->playback_only) {
+ playback = 1;
+ capture = 0;
+ }
+
+ if (rtd->dai_link->capture_only) {
+ playback = 0;
+ capture = 1;
+ }
+
/* create the PCM */
if (rtd->dai_link->no_pcm) {
snprintf(new_name, sizeof(new_name), "(%s)",