summaryrefslogtreecommitdiffstats
path: root/sound
diff options
context:
space:
mode:
authorAntonio Ospite <ospite@studenti.unina.it>2011-03-18 12:47:33 +0100
committerMark Brown <broonie@opensource.wolfsonmicro.com>2011-03-30 09:26:31 +0900
commitefd6947945fe5ebcf759e762f51c4e1d867edc49 (patch)
tree65a603886037c586a90b594bfd66278cf9f2d478 /sound
parent326b9bdc2a0e4d556a0f444085dca103bcd505de (diff)
downloadblackbird-op-linux-efd6947945fe5ebcf759e762f51c4e1d867edc49.tar.gz
blackbird-op-linux-efd6947945fe5ebcf759e762f51c4e1d867edc49.zip
ASoC: zylonite: set .codec_dai_name in initializer
Fix the initialization of .codec_dai_name in zylonite_dai initializer, do not mix it with the initialization of .codec_name which is set already a few lines above. Signed-off-by: Antonio Ospite <ospite@studenti.unina.it> Acked-by: Eric Miao <eric.y.miao@gmail.com> Acked-by: Liam Girdwood <lrg@slimlogic.co.uk> Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Diffstat (limited to 'sound')
-rw-r--r--sound/soc/pxa/zylonite.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/sound/soc/pxa/zylonite.c b/sound/soc/pxa/zylonite.c
index ac577263b3e3..b6445757fc54 100644
--- a/sound/soc/pxa/zylonite.c
+++ b/sound/soc/pxa/zylonite.c
@@ -167,7 +167,7 @@ static struct snd_soc_dai_link zylonite_dai[] = {
.codec_name = "wm9713-codec",
.platform_name = "pxa-pcm-audio",
.cpu_dai_name = "pxa2xx-ac97",
- .codec_name = "wm9713-hifi",
+ .codec_dai_name = "wm9713-hifi",
.init = zylonite_wm9713_init,
},
{
@@ -176,7 +176,7 @@ static struct snd_soc_dai_link zylonite_dai[] = {
.codec_name = "wm9713-codec",
.platform_name = "pxa-pcm-audio",
.cpu_dai_name = "pxa2xx-ac97-aux",
- .codec_name = "wm9713-aux",
+ .codec_dai_name = "wm9713-aux",
},
{
.name = "WM9713 Voice",
@@ -184,7 +184,7 @@ static struct snd_soc_dai_link zylonite_dai[] = {
.codec_name = "wm9713-codec",
.platform_name = "pxa-pcm-audio",
.cpu_dai_name = "pxa-ssp-dai.2",
- .codec_name = "wm9713-voice",
+ .codec_dai_name = "wm9713-voice",
.ops = &zylonite_voice_ops,
},
};
OpenPOWER on IntegriCloud