From 0b25ad0571e9208c2bd1302a41ce219794c6f901 Mon Sep 17 00:00:00 2001
From: Jarkko Nikula <jhnikula@gmail.com>
Date: Tue, 21 Sep 2010 15:36:49 +0300
Subject: 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: Jarkko Nikula <jhnikula@gmail.com>
Acked-by: Liam Girdwood <lrg@slimlogic.co.uk>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>

diff --git a/sound/soc/soc-core.c b/sound/soc/soc-core.c
index ab01e39..e9968ff 100644
--- a/sound/soc/soc-core.c
+++ b/sound/soc/soc-core.c
@@ -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);
-- 
cgit v0.10.2