瀏覽代碼

Merge branch 'for-3.2' into for-3.3

Mark Brown 13 年之前
父節點
當前提交
983a150a12
共有 1 個文件被更改,包括 6 次插入0 次删除
  1. 6 0
      sound/soc/soc-core.c

+ 6 - 0
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