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

Commit 0b25ad05 authored by Jarkko Nikula's avatar Jarkko Nikula Committed by Mark Brown
Browse files

ASoC: Remove extra rtd->dev.init_name assignment in soc_probe_dai_link 



rtd->dev.init_name is set twice in soc_probe_dai_link. I removed the first
assignement from dai_link->stream_name since then there won't be sysfs name
changes and usually dai_link->name seems to fit anyway better for a sysfs
directory name.

Signed-off-by: default avatarJarkko Nikula <jhnikula@gmail.com>
Acked-by: default avatarLiam Girdwood <lrg@slimlogic.co.uk>
Signed-off-by: default avatarMark Brown <broonie@opensource.wolfsonmicro.com>
parent 13f808cf

sound/soc/soc-core.c

+0 −1
Original line number Diff line number Diff line
@@ -1451,7 +1451,6 @@ static int soc_probe_dai_link(struct snd_soc_card *card, int num) 
	snd_soc_dapm_sync(codec);



	/* register the rtd device */

	rtd->dev.init_name = rtd->dai_link->stream_name;

	rtd->dev.release = rtd_release;

	rtd->dev.init_name = dai_link->name;

	ret = device_register(&rtd->dev);