Merge branch 'for-3.2' into for-3.3

git-mirror · Nov 23, 2011 · 983a150 · 983a150
2 parents 193b2f3 + 5ff1ddf
commit 983a150
Showing 1 changed file with 6 additions and 0 deletions.
diff --git a/sound/soc/soc-core.c b/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