From f2e1f465fb79b1a3fdd64a7ac9acfe179fd4fee0 Mon Sep 17 00:00:00 2001 From: Liam Girdwood Date: Tue, 5 Jun 2012 19:26:59 +0100 Subject: [PATCH] --- yaml --- r: 310789 b: refs/heads/master c: 35ea0655a1bcdb1dcb1c1d0c4b6b391ade9c6d01 h: refs/heads/master i: 310787: f97a892c033b6149fe35f2e0ee9517a04d066921 v: v3 --- [refs] | 2 +- trunk/sound/soc/soc-pcm.c | 6 ++++++ 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index ec751eda6651..e8f261a9d8cc 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: bfd37bb5f681961e255fd2f346c20fdae2ef3f27 +refs/heads/master: 35ea0655a1bcdb1dcb1c1d0c4b6b391ade9c6d01 diff --git a/trunk/sound/soc/soc-pcm.c b/trunk/sound/soc/soc-pcm.c index bedd1717a373..48fd15b312c1 100644 --- a/trunk/sound/soc/soc-pcm.c +++ b/trunk/sound/soc/soc-pcm.c @@ -794,6 +794,9 @@ static struct snd_soc_pcm_runtime *dpcm_get_be(struct snd_soc_card *card, for (i = 0; i < card->num_links; i++) { be = &card->rtd[i]; + if (!be->dai_link->no_pcm) + continue; + if (be->cpu_dai->playback_widget == widget || be->codec_dai->playback_widget == widget) return be; @@ -803,6 +806,9 @@ static struct snd_soc_pcm_runtime *dpcm_get_be(struct snd_soc_card *card, for (i = 0; i < card->num_links; i++) { be = &card->rtd[i]; + if (!be->dai_link->no_pcm) + continue; + if (be->cpu_dai->capture_widget == widget || be->codec_dai->capture_widget == widget) return be;