diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2020-05-02 16:10:54 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2020-05-02 17:26:47 +0200 |
| commit | 5a54c69c4ef81f867aef22811e679f45c29a15b6 (patch) | |
| tree | d4286027c305d5e96f2fbe216f19e1d003924f65 /sound/soc/meson | |
| parent | 527c60e8b7a89d9e63ffa9b9f579d536e0f30568 (diff) | |
Revert "ASoC: meson: axg-card: fix codec-to-codec link setup"
This reverts commit 005aa9f0af9d600d3c8fa655a4aa48e4ec7c5b9d which is
commit 1164284270779e1865cc2046a2a01b58a1e858a9 upstream.
It should not have been backported, I only looked at the "Fixes:" tag,
not the changelog text itself, my fault.
Reported-by: Guillaume Tucker <guillaume.tucker@collabora.com>
Cc: Jerome Brunet <jbrunet@baylibre.com>
Cc: Mark Brown <broonie@kernel.org>
Cc: Sasha Levin <sashal@kernel.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'sound/soc/meson')
| -rw-r--r-- | sound/soc/meson/axg-card.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/sound/soc/meson/axg-card.c b/sound/soc/meson/axg-card.c index 2b04ac3d8fd3..1f698adde506 100644 --- a/sound/soc/meson/axg-card.c +++ b/sound/soc/meson/axg-card.c @@ -586,10 +586,8 @@ static int axg_card_add_link(struct snd_soc_card *card, struct device_node *np, if (axg_card_cpu_is_tdm_iface(dai_link->cpus->of_node)) ret = axg_card_parse_tdm(card, np, index); - else if (axg_card_cpu_is_codec(dai_link->cpus->of_node)) { + else if (axg_card_cpu_is_codec(dai_link->cpus->of_node)) dai_link->params = &codec_params; - dai_link->no_pcm = 0; /* link is not a DPCM BE */ - } return ret; } |