summaryrefslogtreecommitdiff
path: root/sound
diff options
context:
space:
mode:
authorMark Brown <broonie@linaro.org>2014-08-04 19:31:17 +0400
committerMark Brown <broonie@linaro.org>2014-08-04 19:31:17 +0400
commit7196be58ca832b6b37965921714849276f8996bc (patch)
tree2529b7a696cd2ceaaa9a6e3095496ae672111a20 /sound
parenta1cb98ac8b6980fcd530271c739c3dd7436a91aa (diff)
parent0e400c53812e11442785019de7df02e6adc71311 (diff)
downloadlinux-7196be58ca832b6b37965921714849276f8996bc.tar.xz
Merge remote-tracking branch 'asoc/topic/core' into asoc-next
Diffstat (limited to 'sound')
-rw-r--r--sound/soc/soc-core.c9
1 files changed, 8 insertions, 1 deletions
diff --git a/sound/soc/soc-core.c b/sound/soc/soc-core.c
index 28caa63ae526..2d6c8b86b7d3 100644
--- 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