Merge branch 'master' into for-next

Sync with Linus tree to have 157550ff ("mtd: add GPMI-NAND driver
in the config and Makefile") as I have patch depending on that one.

1 files changed, 1 insertions, 5 deletions

diff --git a/sound/soc/pxa/z2.c b/sound/soc/pxa/z2.c
index d69d9fc3223..b311ffe04b7 100644
--- a/sound/soc/pxa/z2.c
+++ b/sound/soc/pxa/z2.c
@@ -161,10 +161,6 @@ static int z2_wm8750_init(struct snd_soc_pcm_runtime *rtd)
         /* Set up z2 specific audio paths */
         snd_soc_dapm_add_routes(dapm, audio_map, ARRAY_SIZE(audio_map));
 
-        ret = snd_soc_dapm_sync(dapm);
-        if (ret)
-                goto err;
-
         /* Jack detection API stuff */
         ret = snd_soc_jack_new(codec, "Headset Jack", SND_JACK_HEADSET,
                                 &hs_jack);
@@ -198,7 +194,7 @@ static struct snd_soc_dai_link z2_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           = z2_wm8750_init,
         .ops            = &z2_ops,
 };