summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMark Brown <broonie@linaro.org>2014-08-04 16:31:17 +0100
committerMark Brown <broonie@linaro.org>2014-08-04 16:31:17 +0100
commit7196be58ca832b6b37965921714849276f8996bc (patch)
tree2529b7a696cd2ceaaa9a6e3095496ae672111a20
parenta1cb98ac8b6980fcd530271c739c3dd7436a91aa (diff)
parent0e400c53812e11442785019de7df02e6adc71311 (diff)
downloadop-kernel-dev-7196be58ca832b6b37965921714849276f8996bc.zip
op-kernel-dev-7196be58ca832b6b37965921714849276f8996bc.tar.gz
Merge remote-tracking branch 'asoc/topic/core' into asoc-next
-rw-r--r--MAINTAINERS7
-rw-r--r--include/sound/soc.h2
-rw-r--r--sound/soc/soc-core.c9
3 files changed, 17 insertions, 1 deletions
diff --git a/MAINTAINERS b/MAINTAINERS
index c2066f4..6d383ec 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -7479,6 +7479,13 @@ F: drivers/rtc/
F: include/linux/rtc.h
F: include/uapi/linux/rtc.h
+REALTEK AUDIO CODECS
+M: Bard Liao <bardliao@realtek.com>
+M: Oder Chiou <oder_chiou@realtek.com>
+S: Maintained
+F: sound/soc/codecs/rt*
+F: include/sound/rt*.h
+
REISERFS FILE SYSTEM
L: reiserfs-devel@vger.kernel.org
S: Supported
diff --git a/include/sound/soc.h b/include/sound/soc.h
index 50ff6f3..27ed5cc 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 28caa63..2d6c8b8 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
OpenPOWER on IntegriCloud