diff options
| author | Daniel Baluta <daniel.baluta@nxp.com> | 2020-01-28 21:42:34 +0200 |
|---|---|---|
| committer | Daniel Baluta <daniel.baluta@nxp.com> | 2020-02-10 17:01:57 +0200 |
| commit | a6f61fb45139e5a0e6741a3182635649454136b3 (patch) | |
| tree | fed6c916ef9099f9e3f90389922287c5659ae94a /sound/soc/soc-core.c | |
| parent | b7ecbc714922188546f07187621a1b8504ece9e1 (diff) | |
LF-537-15: ASoC: core: Don't override platform name is of_node is set
Signed-off-by: Daniel Baluta <daniel.baluta@nxp.com>
Diffstat (limited to 'sound/soc/soc-core.c')
| -rw-r--r-- | sound/soc/soc-core.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/sound/soc/soc-core.c b/sound/soc/soc-core.c index 9d3b546bae7b..980c7fe86efc 100644 --- a/sound/soc/soc-core.c +++ b/sound/soc/soc-core.c @@ -1882,7 +1882,9 @@ match: dev_err(card->dev, "init platform error"); continue; } - dai_link->platforms->name = component->name; + + if (!dai_link->platforms->of_node) + dai_link->platforms->name = component->name; /* convert non BE into BE */ dai_link->no_pcm = 1; |