Merge remote-tracking branches 'asoc/topic/adsp', 'asoc/topic/atmel', 'asoc/topic...

[firefly-linux-kernel-4.4.55.git] / sound / soc / generic / simple-card.c

diff --git a/sound/soc/generic/simple-card.c b/sound/soc/generic/simple-card.c
index 53395f54849a95f56b15eeeccabe2107c9f7fd76..2a1b1b5b5221089f32e395087e9c4651ddd00799 100644 (file)
--- a/sound/soc/generic/simple-card.c
+++ b/sound/soc/generic/simple-card.c
@@ -160,6 +160,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)   +