diff options
-rw-r--r-- | sound/soc/soc-core.c | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/sound/soc/soc-core.c b/sound/soc/soc-core.c index b87d7d882e6d..63d11071fdba 100644 --- a/sound/soc/soc-core.c +++ b/sound/soc/soc-core.c | |||
@@ -4420,9 +4420,16 @@ EXPORT_SYMBOL_GPL(snd_soc_unregister_codec); | |||
4420 | int snd_soc_of_parse_card_name(struct snd_soc_card *card, | 4420 | int snd_soc_of_parse_card_name(struct snd_soc_card *card, |
4421 | const char *propname) | 4421 | const char *propname) |
4422 | { | 4422 | { |
4423 | struct device_node *np = card->dev->of_node; | 4423 | struct device_node *np; |
4424 | int ret; | 4424 | int ret; |
4425 | 4425 | ||
4426 | if (!card->dev) { | ||
4427 | pr_err("card->dev is not set before calling %s\n", __func__); | ||
4428 | return -EINVAL; | ||
4429 | } | ||
4430 | |||
4431 | np = card->dev->of_node; | ||
4432 | |||
4426 | ret = of_property_read_string_index(np, propname, 0, &card->name); | 4433 | ret = of_property_read_string_index(np, propname, 0, &card->name); |
4427 | /* | 4434 | /* |
4428 | * EINVAL means the property does not exist. This is fine providing | 4435 | * EINVAL means the property does not exist. This is fine providing |