|
@@ -763,10 +763,11 @@ static int soc_bind_dai_link(struct snd_soc_card *card, int num)
|
|
|
}
|
|
|
/* no, then find CPU DAI from registered DAIs*/
|
|
|
list_for_each_entry(cpu_dai, &dai_list, list) {
|
|
|
- if (!strcmp(cpu_dai->name, dai_link->cpu_dai_name)) {
|
|
|
- rtd->cpu_dai = cpu_dai;
|
|
|
- goto find_codec;
|
|
|
- }
|
|
|
+ if (strcmp(cpu_dai->name, dai_link->cpu_dai_name))
|
|
|
+ continue;
|
|
|
+
|
|
|
+ rtd->cpu_dai = cpu_dai;
|
|
|
+ goto find_codec;
|
|
|
}
|
|
|
dev_dbg(card->dev, "CPU DAI %s not registered\n",
|
|
|
dai_link->cpu_dai_name);
|
|
@@ -779,22 +780,28 @@ find_codec:
|
|
|
|
|
|
/* no, then find CODEC from registered CODECs*/
|
|
|
list_for_each_entry(codec, &codec_list, list) {
|
|
|
- if (!strcmp(codec->name, dai_link->codec_name)) {
|
|
|
- rtd->codec = codec;
|
|
|
-
|
|
|
- /* CODEC found, so find CODEC DAI from registered DAIs from this CODEC*/
|
|
|
- list_for_each_entry(codec_dai, &dai_list, list) {
|
|
|
- if (codec->dev == codec_dai->dev &&
|
|
|
- !strcmp(codec_dai->name, dai_link->codec_dai_name)) {
|
|
|
- rtd->codec_dai = codec_dai;
|
|
|
- goto find_platform;
|
|
|
- }
|
|
|
- }
|
|
|
- dev_dbg(card->dev, "CODEC DAI %s not registered\n",
|
|
|
- dai_link->codec_dai_name);
|
|
|
+ if (strcmp(codec->name, dai_link->codec_name))
|
|
|
+ continue;
|
|
|
+
|
|
|
+ rtd->codec = codec;
|
|
|
|
|
|
- goto find_platform;
|
|
|
+ /*
|
|
|
+ * CODEC found, so find CODEC DAI from registered DAIs from
|
|
|
+ * this CODEC
|
|
|
+ */
|
|
|
+ list_for_each_entry(codec_dai, &dai_list, list) {
|
|
|
+ if (codec->dev == codec_dai->dev &&
|
|
|
+ !strcmp(codec_dai->name,
|
|
|
+ dai_link->codec_dai_name)) {
|
|
|
+
|
|
|
+ rtd->codec_dai = codec_dai;
|
|
|
+ goto find_platform;
|
|
|
+ }
|
|
|
}
|
|
|
+ dev_dbg(card->dev, "CODEC DAI %s not registered\n",
|
|
|
+ dai_link->codec_dai_name);
|
|
|
+
|
|
|
+ goto find_platform;
|
|
|
}
|
|
|
dev_dbg(card->dev, "CODEC %s not registered\n",
|
|
|
dai_link->codec_name);
|
|
@@ -811,10 +818,11 @@ find_platform:
|
|
|
|
|
|
/* no, then find one from the set of registered platforms */
|
|
|
list_for_each_entry(platform, &platform_list, list) {
|
|
|
- if (!strcmp(platform->name, platform_name)) {
|
|
|
- rtd->platform = platform;
|
|
|
- goto out;
|
|
|
- }
|
|
|
+ if (strcmp(platform->name, platform_name))
|
|
|
+ continue;
|
|
|
+
|
|
|
+ rtd->platform = platform;
|
|
|
+ goto out;
|
|
|
}
|
|
|
|
|
|
dev_dbg(card->dev, "platform %s not registered\n",
|