diff options
| author | Mark Brown <broonie@linaro.org> | 2014-07-30 19:47:20 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@linaro.org> | 2014-07-30 19:47:20 +0100 |
| commit | 2128ee19fc27eaf7db434da8f7e15efa884eac90 (patch) | |
| tree | 43c20481adad9600466761d156bd82a3971c2fcf | |
| parent | be0c4cd9b860070727192aa8ba6ff6e3163f5f35 (diff) | |
| parent | 7e07e7c0854b32181b314f5ba43007629594663a (diff) | |
Merge remote-tracking branch 'asoc/topic/core' into asoc-next
| -rw-r--r-- | include/sound/soc.h | 2 | ||||
| -rw-r--r-- | sound/soc/soc-core.c | 9 |
2 files changed, 10 insertions, 1 deletions
diff --git a/include/sound/soc.h b/include/sound/soc.h index 50ff6f3459aa..27ed5ccb174a 100644 --- a/include/sound/soc.h +++ b/include/sound/soc.h @@ -248,6 +248,8 @@ .info = snd_soc_info_enum_double, \ .get = xhandler_get, .put = xhandler_put, \ .private_value = (unsigned long)&xenum } +#define SOC_VALUE_ENUM_EXT(xname, xenum, xhandler_get, xhandler_put) \ + SOC_ENUM_EXT(xname, xenum, xhandler_get, xhandler_put) #define SND_SOC_BYTES(xname, xbase, xregs) \ { .iface = SNDRV_CTL_ELEM_IFACE_MIXER, .name = xname, \ 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 |