p71924506
/
linux_old1
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

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

This commit is contained in:
Mark Brown 2014-08-04 16:31:17 +01:00
parent a1cb98ac8b 0e400c5381
commit 7196be58ca
3 changed files with 17 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
MAINTAINERS
View File

@ -7479,6 +7479,13 @@ F: drivers/rtc/
F: include/linux/rtc.h F: include/linux/rtc.h
F: include/uapi/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 REISERFS FILE SYSTEM
L: reiserfs-devel@vger.kernel.org L: reiserfs-devel@vger.kernel.org
S: Supported S: Supported

2
include/sound/soc.h
View File

@ -248,6 +248,8 @@
.info = snd_soc_info_enum_double, \ .info = snd_soc_info_enum_double, \
.get = xhandler_get, .put = xhandler_put, \ .get = xhandler_get, .put = xhandler_put, \
.private_value = (unsigned long)&xenum } .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) \ #define SND_SOC_BYTES(xname, xbase, xregs) \
{ .iface = SNDRV_CTL_ELEM_IFACE_MIXER, .name = xname, \ { .iface = SNDRV_CTL_ELEM_IFACE_MIXER, .name = xname, \

9
sound/soc/soc-core.c
View File

@ -4518,9 +4518,16 @@ EXPORT_SYMBOL_GPL(snd_soc_unregister_codec);
int snd_soc_of_parse_card_name(struct snd_soc_card *card, int snd_soc_of_parse_card_name(struct snd_soc_card *card,
const char *propname) const char *propname)
{ {
struct device_node *np = card->dev->of_node; struct device_node *np;
int ret; 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); ret = of_property_read_string_index(np, propname, 0, &card->name);
/* /*
* EINVAL means the property does not exist. This is fine providing * EINVAL means the property does not exist. This is fine providing