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

Commit 2824ef9b authored by Mark Brown's avatar Mark Brown
Browse files

Merge remote-tracking branch 'asoc/fix/simple' into asoc-linus

parents 95d67c7f 31f3032c

sound/soc/generic/simple-card.c

+5 −0
Original line number Diff line number Diff line
@@ -372,6 +372,11 @@ static int asoc_simple_card_dai_link_of(struct device_node *node, 
			    strlen(dai_link->cpu_dai_name)   +

			    strlen(dai_link->codec_dai_name) + 2,

			    GFP_KERNEL);

	if (!name) {

		ret = -ENOMEM;

		goto dai_link_of_err;

	}



	sprintf(name, "%s-%s", dai_link->cpu_dai_name,

				dai_link->codec_dai_name);

	dai_link->name = dai_link->stream_name = name;