浏览代码

Merge remote-tracking branch 'asoc/topic/core' into asoc-next

Mark Brown 9 年之前
父节点
当前提交
977011ea0c
共有 1 个文件被更改,包括 4 次插入4 次删除
  1. 4 4
      sound/soc/soc-core.c

+ 4 - 4
sound/soc/soc-core.c

@@ -986,16 +986,16 @@ static int soc_bind_dai_link(struct snd_soc_card *card,
 
 
 	dev_dbg(card->dev, "ASoC: binding %s\n", dai_link->name);
 	dev_dbg(card->dev, "ASoC: binding %s\n", dai_link->name);
 
 
-	rtd = soc_new_pcm_runtime(card, dai_link);
-	if (!rtd)
-		return -ENOMEM;
-
 	if (soc_is_dai_link_bound(card, dai_link)) {
 	if (soc_is_dai_link_bound(card, dai_link)) {
 		dev_dbg(card->dev, "ASoC: dai link %s already bound\n",
 		dev_dbg(card->dev, "ASoC: dai link %s already bound\n",
 			dai_link->name);
 			dai_link->name);
 		return 0;
 		return 0;
 	}
 	}
 
 
+	rtd = soc_new_pcm_runtime(card, dai_link);
+	if (!rtd)
+		return -ENOMEM;
+
 	cpu_dai_component.name = dai_link->cpu_name;
 	cpu_dai_component.name = dai_link->cpu_name;
 	cpu_dai_component.of_node = dai_link->cpu_of_node;
 	cpu_dai_component.of_node = dai_link->cpu_of_node;
 	cpu_dai_component.dai_name = dai_link->cpu_dai_name;
 	cpu_dai_component.dai_name = dai_link->cpu_dai_name;