diff --git a/[refs] b/[refs]
index f435d997d18b..4844d3a39614 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: d08664fdb50795b29cf70b0269ea02f7248e76c3
+refs/heads/master: e3509ff0fb9df53e45cd68488e3b463a80455db7
diff --git a/trunk/sound/soc/soc-core.c b/trunk/sound/soc/soc-core.c
index 4aa8e2d35061..3f44150d8e30 100644
--- a/trunk/sound/soc/soc-core.c
+++ b/trunk/sound/soc/soc-core.c
@@ -628,6 +628,12 @@ static int soc_suspend(struct platform_device *pdev, pm_message_t state)
 	struct snd_soc_codec *codec = card->codec;
 	int i;
 
+	/* If the initialization of this soc device failed, there is no codec
+	 * associated with it. Just bail out in this case.
+	 */
+	if (!codec)
+		return 0;
+
 	/* Due to the resume being scheduled into a workqueue we could
 	* suspend before that's finished - wait for it to complete.
 	 */