Merge remote-tracking branches 'asoc/topic/ad1836', 'asoc/topic/ad193x', 'asoc/topic...

[~andy/linux] / sound / soc / generic / simple-card.c

diff --git a/sound/soc/generic/simple-card.c b/sound/soc/generic/simple-card.c
index 58c217e403ae3d02bdc8a8c24afe0a1c20d7fbaf..c0d928138c88c4eadef6243098350f09f19eaa1c 100644 (file)
--- a/sound/soc/generic/simple-card.c
+++ b/sound/soc/generic/simple-card.c
@@ -163,6 +163,9 @@ static int asoc_simple_card_parse_of(struct device_node *node,
        if (ret < 0)
                return ret;
 
+       if (!info->cpu_dai.name || !info->codec_dai.name)
+               return -EINVAL;
+
        /* card name is created from CPU/CODEC dai name */
        name = devm_kzalloc(dev,
                            strlen(info->cpu_dai.name)   +