diff options
| author |   Mark Brown <broonie@kernel.org> | 2019-05-30 16:47:43 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2019-05-30 16:47:43 +0100 |
| commit | 79b3b7c4a396b9fa1963ac70e853998633e8151d (patch) | |
| tree | c1e507b4a6fff773ec81e90e1be11f1b35e773b6 /sound/soc/generic | |
| parent | ASoC: SOF: add COMPILE_TEST for PCI options (diff) | |
| parent | ASoC: sun4i-codec: fix first delay on Speaker (diff) | |
| download | linux-dev-79b3b7c4a396b9fa1963ac70e853998633e8151d.tar.xz linux-dev-79b3b7c4a396b9fa1963ac70e853998633e8151d.zip | |
Merge branch 'asoc-5.2' into asoc-5.3
Diffstat (limited to 'sound/soc/generic')
| -rw-r--r-- | sound/soc/generic/simple-card.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/sound/soc/generic/simple-card.c b/sound/soc/generic/simple-card.c index c2a2c5fd0801..d16e894fce2b 100644 --- a/sound/soc/generic/simple-card.c +++ b/sound/soc/generic/simple-card.c @@ -283,6 +283,11 @@ static int simple_dai_link_of(struct asoc_simple_priv *priv, codec_dai = dai_props->codec_dai = &priv->dais[li->dais++]; + ret = asoc_simple_parse_daifmt(dev, node, codec, + prefix, &dai_link->dai_fmt); + if (ret < 0) + goto dai_link_of_err; + simple_parse_mclk_fs(top, cpu, codec, dai_props, prefix); ret = asoc_simple_parse_cpu(cpu, dai_link, &single_cpu); @@ -293,11 +298,6 @@ static int simple_dai_link_of(struct asoc_simple_priv *priv, if (ret < 0) goto dai_link_of_err; - ret = asoc_simple_parse_daifmt(dev, node, dai_link->codecs->of_node, - prefix, &dai_link->dai_fmt); - if (ret < 0) - goto dai_link_of_err; - ret = asoc_simple_parse_platform(plat, dai_link); if (ret < 0) goto dai_link_of_err; |