Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/teigland...

[karo-tx-linux.git] / sound / soc / pxa / spitz.c

diff --git a/sound/soc/pxa/spitz.c b/sound/soc/pxa/spitz.c
index b253d864868a558001dd9e6e90b0e33d739a254d..c2d6ff9b1588a63c7faed4477e944b5948da51d7 100644 (file)
--- a/sound/soc/pxa/spitz.c
+++ b/sound/soc/pxa/spitz.c
@@ -301,7 +301,6 @@ static int spitz_wm8750_init(struct snd_soc_pcm_runtime *rtd)
        /* Set up spitz specific audio paths */
        snd_soc_dapm_add_routes(dapm, audio_map, ARRAY_SIZE(audio_map));
 
-       snd_soc_dapm_sync(dapm);
        return 0;
 }
 
@@ -312,7 +311,7 @@ static struct snd_soc_dai_link spitz_dai = {
        .cpu_dai_name = "pxa2xx-i2s",
        .codec_dai_name = "wm8750-hifi",
        .platform_name = "pxa-pcm-audio",
-       .codec_name = "wm8750-codec.0-001b",
+       .codec_name = "wm8750.0-001b",
        .init = spitz_wm8750_init,
        .ops = &spitz_ops,
 };