Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 7196be58 authored by Mark Brown's avatar Mark Brown
Browse files

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

parents a1cb98ac 0e400c53

MAINTAINERS

+7 −0
Original line number Diff line number Diff line
@@ -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

include/sound/soc.h

+2 −0
Original line number Diff line number Diff line
@@ -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,   \

sound/soc/soc-core.c

+8 −1
Original line number Diff line number Diff line
@@ -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