diff --git a/[refs] b/[refs]
index 9f659f2328b2..8a199756b8bd 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 680fa1f807bc65ea147c6c3ea52751cab75bcd34
+refs/heads/master: 4b1cfcb4f36dca33b4552d9612537e6c0ca73639
diff --git a/trunk/sound/soc/soc-core.c b/trunk/sound/soc/soc-core.c
index d6af52bd97df..a5d3685a5d38 100644
--- a/trunk/sound/soc/soc-core.c
+++ b/trunk/sound/soc/soc-core.c
@@ -1055,13 +1055,13 @@ static int soc_post_component_init(struct snd_soc_card *card,
 	}
 	rtd->card = card;
 
+	/* Make sure all DAPM widgets are instantiated */
+	snd_soc_dapm_new_widgets(&codec->dapm);
+
 	/* machine controls, routes and widgets are not prefixed */
 	temp = codec->name_prefix;
 	codec->name_prefix = NULL;
 
-	/* Make sure all DAPM widgets are instantiated */
-	snd_soc_dapm_new_widgets(&codec->dapm);
-
 	/* do machine specific initialization */
 	if (!dailess && dai_link->init)
 		ret = dai_link->init(rtd);