Merge remote-tracking branch 'asoc/topic/core' into asoc-next

[karo-tx-linux.git] / sound / soc / soc-core.c

diff --git a/sound/soc/soc-core.c b/sound/soc/soc-core.c
index 28caa63ae526c260617724ff08c9121370f66026..2d6c8b86b7d37639f70dfc3c26b35ff06e3908ca 100644 (file)
--- a/sound/soc/soc-core.c
+++ b/sound/soc/soc-core.c
@@ -4518,9 +4518,16 @@ EXPORT_SYMBOL_GPL(snd_soc_unregister_codec);
 int snd_soc_of_parse_card_name(struct snd_soc_card *card,
                               const char *propname)
 {
-       struct device_node *np = card->dev->of_node;
+       struct device_node *np;
        int ret;
 
+       if (!card->dev) {
+               pr_err("card->dev is not set before calling %s\n", __func__);
+               return -EINVAL;
+       }
+
+       np = card->dev->of_node;
+
        ret = of_property_read_string_index(np, propname, 0, &card->name);
        /*
         * EINVAL means the property does not exist. This is fine providing