Skip to content

Commit

Permalink
Merge pull request torvalds#533 from plbossart/merge/backport-v4.20-i…
Browse files Browse the repository at this point in the history
…ntel-audio-20190111-2

Merge/backport v4.20 intel audio 20190111 2
  • Loading branch information
plbossart authored Jan 11, 2019
2 parents 84d0af0 + 41c0391 commit 2ac82ee
Showing 1 changed file with 0 additions and 19 deletions.
19 changes: 0 additions & 19 deletions sound/soc/soc-core.c
Original file line number Diff line number Diff line change
Expand Up @@ -1129,16 +1129,6 @@ static int soc_init_dai_link(struct snd_soc_card *card,
link->name);
return -EINVAL;
}

/*
* Defer card registration if platform dai component is not added to
* component list.
*/
if (link->platform->of_node || link->platform->name)
if (!soc_find_component(link->platform->of_node,
link->platform->name))
return -EPROBE_DEFER;

/*
* CPU device may be specified by either name or OF node, but
* can be left unspecified, and will be matched based on DAI
Expand All @@ -1150,15 +1140,6 @@ static int soc_init_dai_link(struct snd_soc_card *card,
link->name);
return -EINVAL;
}

/*
* Defer card registration if cpu dai component is not added to
* component list.
*/
if (link->cpu_of_node || link->cpu_name)
if (!soc_find_component(link->cpu_of_node, link->cpu_name))
return -EPROBE_DEFER;

/*
* At least one of CPU DAI name or CPU device name/node must be
* specified
Expand Down

0 comments on commit 2ac82ee

Please sign in to comment.