diff options
| author | AngeloGioacchino Del Regno <angelogioacchino.delregno@collabora.com> | 2024-03-13 12:01:29 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2024-03-25 14:19:08 +0000 |
| commit | 5f39231888c63f0a7708abc86b51b847476379d8 (patch) | |
| tree | 066b6576c9e64fa54b3830bd31e65e8a0e928624 | |
| parent | d6c01755805d346a1382d2d81c214b2ca557487a (diff) | |
| download | linux-stable-5f39231888c63f0a7708abc86b51b847476379d8.tar.gz linux-stable-5f39231888c63f0a7708abc86b51b847476379d8.tar.bz2 linux-stable-5f39231888c63f0a7708abc86b51b847476379d8.zip | |
ASoC: mediatek: Assign dummy when codec not specified for a DAI link
MediaTek sound card drivers are checking whether a DAI link is present
and used on a board to assign the correct parameters and this is done
by checking the codec DAI names at probe time.
If no real codec is present, assign the dummy codec to the DAI link
to avoid NULL pointer during string comparison.
Fixes: 4302187d955f ("ASoC: mediatek: common: add soundcard driver common code")
Signed-off-by: AngeloGioacchino Del Regno <angelogioacchino.delregno@collabora.com>
Link: https://msgid.link/r/20240313110147.1267793-5-angelogioacchino.delregno@collabora.com
Signed-off-by: Mark Brown <broonie@kernel.org>
| -rw-r--r-- | sound/soc/mediatek/common/mtk-soundcard-driver.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/sound/soc/mediatek/common/mtk-soundcard-driver.c b/sound/soc/mediatek/common/mtk-soundcard-driver.c index a58e1e3674de..000a086a8cf4 100644 --- a/sound/soc/mediatek/common/mtk-soundcard-driver.c +++ b/sound/soc/mediatek/common/mtk-soundcard-driver.c @@ -22,7 +22,11 @@ static int set_card_codec_info(struct snd_soc_card *card, codec_node = of_get_child_by_name(sub_node, "codec"); if (!codec_node) { - dev_dbg(dev, "%s no specified codec\n", dai_link->name); + dev_dbg(dev, "%s no specified codec: setting dummy.\n", dai_link->name); + + dai_link->codecs = &snd_soc_dummy_dlc; + dai_link->num_codecs = 1; + dai_link->dynamic = 1; return 0; } |