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

Commit 977011ea authored by Mark Brown's avatar Mark Brown
Browse files

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

parents e87fb3b1 513cb311

sound/soc/soc-core.c

+4 −4
Original line number Diff line number Diff line
@@ -986,16 +986,16 @@ static int soc_bind_dai_link(struct snd_soc_card *card, 


	dev_dbg(card->dev, "ASoC: binding %s\n", dai_link->name);



	rtd = soc_new_pcm_runtime(card, dai_link);

	if (!rtd)

		return -ENOMEM;



	if (soc_is_dai_link_bound(card, dai_link)) {

		dev_dbg(card->dev, "ASoC: dai link %s already bound\n",

			dai_link->name);

		return 0;

	}



	rtd = soc_new_pcm_runtime(card, dai_link);

	if (!rtd)

		return -ENOMEM;



	cpu_dai_component.name = dai_link->cpu_name;

	cpu_dai_component.of_node = dai_link->cpu_of_node;

	cpu_dai_component.dai_name = dai_link->cpu_dai_name;