ASoC: fsl/pcm030 add unique dai_link names
authorEric Millbrandt <emillbrandt@dekaresearch.com>
Wed, 10 Oct 2012 14:10:08 +0000 (10:10 -0400)
committerMark Brown <broonie@opensource.wolfsonmicro.com>
Mon, 22 Oct 2012 15:16:41 +0000 (16:16 +0100)
Assign each dai_link a unique name to avoid this run-time error.

[   18.978043] pcm030-audio-fabric sound.2:  wm9712-hifi <-> mpc5200-psc-ac97.0 mapping ok
[   19.003179] sysfs: cannot create duplicate filename '/devices/sound.2/AC97'

Signed-off-by: Eric Millbrandt <emillbrandt@dekaresearch.com>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
sound/soc/fsl/pcm030-audio-fabric.c

index 4b63ec8eb372ee917a06c314764a2d7f6804a892..4d261927662ff123cca004beb025919eaee508fe 100644 (file)
@@ -29,14 +29,14 @@ struct pcm030_audio_data {
 
 static struct snd_soc_dai_link pcm030_fabric_dai[] = {
 {
-       .name = "AC97",
+       .name = "AC97.0",
        .stream_name = "AC97 Analog",
        .codec_dai_name = "wm9712-hifi",
        .cpu_dai_name = "mpc5200-psc-ac97.0",
        .codec_name = "wm9712-codec",
 },
 {
-       .name = "AC97",
+       .name = "AC97.1",
        .stream_name = "AC97 IEC958",
        .codec_dai_name = "wm9712-aux",
        .cpu_dai_name = "mpc5200-psc-ac97.1",