Revert "ASoC: meson: axg-card: fix codec-to-codec link setup"
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Sat, 2 May 2020 14:10:54 +0000 (16:10 +0200)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Sat, 2 May 2020 15:26:47 +0000 (17:26 +0200)
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>
sound/soc/meson/axg-card.c

index 2b04ac3..1f698ad 100644 (file)
@@ -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;
 }