Skip to content

Commit

Permalink
ASoC: Remove extra rtd->dev.init_name assignment in soc_probe_dai_link
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Jarkko Nikula authored and Mark Brown committed Sep 21, 2010
1 parent 13f808c commit 0b25ad0
Showing 1 changed file with 0 additions and 1 deletion.
1 change: 0 additions & 1 deletion sound/soc/soc-core.c
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down

0 comments on commit 0b25ad0

Please sign in to comment.