summaryrefslogtreecommitdiff
path: root/sound/soc/soc-dapm.c
diff options
context:
space:
mode:
authorMark Brown <broonie@kernel.org>2018-08-14 16:23:30 +0100
committerMark Brown <broonie@kernel.org>2018-08-14 16:23:30 +0100
commit1c359c13943eee1026d1f905798a734f40702fd7 (patch)
tree12ca77ca3f3a31600f7925aa64263e78aea740f6 /sound/soc/soc-dapm.c
parent94710cac0ef4ee177a63b5227664b38c95bbf703 (diff)
parent0717edbdfed61b4c1e8291140f78882d3a481042 (diff)
downloadlinux-next-1c359c13943eee1026d1f905798a734f40702fd7.tar.gz
Merge branch 'asoc-4.18' into asoc-linus
Diffstat (limited to 'sound/soc/soc-dapm.c')
-rw-r--r--sound/soc/soc-dapm.c7
1 files changed, 7 insertions, 0 deletions
diff --git a/sound/soc/soc-dapm.c b/sound/soc/soc-dapm.c
index 229c12349803..a099c3e45504 100644
--- a/sound/soc/soc-dapm.c
+++ b/sound/soc/soc-dapm.c
@@ -4073,6 +4073,13 @@ int snd_soc_dapm_link_dai_widgets(struct snd_soc_card *card)
continue;
}
+ /* let users know there is no DAI to link */
+ if (!dai_w->priv) {
+ dev_dbg(card->dev, "dai widget %s has no DAI\n",
+ dai_w->name);
+ continue;
+ }
+
dai = dai_w->priv;
/* ...find all widgets with the same stream and link them */