aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMark Brown <broonie@kernel.org>2016-03-13 04:16:19 -0400
committerMark Brown <broonie@kernel.org>2016-03-13 04:16:19 -0400
commit977011ea0cf28549d55986e5a7855b6b57b07988 (patch)
tree6ae2eb0eb2a2a7414d1641abbe896314d26a8fa6
parente87fb3b117e25833ff9349412f29b99b203531a6 (diff)
parent513cb31120fb5a5b02d9e42eb1d0a0bf05e227c5 (diff)
Merge remote-tracking branch 'asoc/topic/core' into asoc-next
-rw-r--r--sound/soc/soc-core.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/sound/soc/soc-core.c b/sound/soc/soc-core.c
index 790ee2bf1a47..d2e62b159610 100644
--- a/sound/soc/soc-core.c
+++ b/sound/soc/soc-core.c
@@ -986,16 +986,16 @@ static int soc_bind_dai_link(struct snd_soc_card *card,
986 986
987 dev_dbg(card->dev, "ASoC: binding %s\n", dai_link->name); 987 dev_dbg(card->dev, "ASoC: binding %s\n", dai_link->name);
988 988
989 rtd = soc_new_pcm_runtime(card, dai_link);
990 if (!rtd)
991 return -ENOMEM;
992
993 if (soc_is_dai_link_bound(card, dai_link)) { 989 if (soc_is_dai_link_bound(card, dai_link)) {
994 dev_dbg(card->dev, "ASoC: dai link %s already bound\n", 990 dev_dbg(card->dev, "ASoC: dai link %s already bound\n",
995 dai_link->name); 991 dai_link->name);
996 return 0; 992 return 0;
997 } 993 }
998 994
995 rtd = soc_new_pcm_runtime(card, dai_link);
996 if (!rtd)
997 return -ENOMEM;
998
999 cpu_dai_component.name = dai_link->cpu_name; 999 cpu_dai_component.name = dai_link->cpu_name;
1000 cpu_dai_component.of_node = dai_link->cpu_of_node; 1000 cpu_dai_component.of_node = dai_link->cpu_of_node;
1001 cpu_dai_component.dai_name = dai_link->cpu_dai_name; 1001 cpu_dai_component.dai_name = dai_link->cpu_dai_name;