diff --git a/[refs] b/[refs]
index 4284fe5e09e9..28ff48d8b47b 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 193b2f3f53690ca1f7409340dd9e63fcac1f6277
+refs/heads/master: 983a150a12f8cf729784d3118b25a757f8cbe46a
diff --git a/trunk/sound/soc/soc-core.c b/trunk/sound/soc/soc-core.c
index bf41d9071f1e..b194842c4cc3 100644
--- a/trunk/sound/soc/soc-core.c
+++ b/trunk/sound/soc/soc-core.c
@@ -709,6 +709,12 @@ int snd_soc_resume(struct device *dev)
 	struct snd_soc_card *card = dev_get_drvdata(dev);
 	int i, ac97_control = 0;
 
+	/* If the initialization of this soc device failed, there is no codec
+	 * associated with it. Just bail out in this case.
+	 */
+	if (list_empty(&card->codec_dev_list))
+		return 0;
+
 	/* AC97 devices might have other drivers hanging off them so
 	 * need to resume immediately.  Other drivers don't have that
 	 * problem and may take a substantial amount of time to resume