Commit 69d0f88b authored by Peter Ujfalusi's avatar Peter Ujfalusi Committed by Mark Brown

ASoC: Intel: skl_hda_dsp_generic: Use devm_kasprintf for the components string

Instead of using a global char array, allocate the string with
devm_kasprintf if needed.
Reviewed-by: default avatarBard Liao <yung-chuan.liao@linux.intel.com>
Reviewed-by: default avatarRanjani Sridharan <ranjani.sridharan@linux.intel.com>
Reviewed-by: default avatarKai Vehmanen <kai.vehmanen@linux.intel.com>
Signed-off-by: default avatarPeter Ujfalusi <peter.ujfalusi@linux.intel.com>
Signed-off-by: default avatarPierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
Link: https://lore.kernel.org/r/20240426152123.36284-3-pierre-louis.bossart@linux.intel.comSigned-off-by: default avatarMark Brown <broonie@kernel.org>
parent 33e59e50
......@@ -92,8 +92,6 @@ skl_hda_add_dai_link(struct snd_soc_card *card, struct snd_soc_dai_link *link)
return ret;
}
static char hda_soc_components[30];
#define IDISP_DAI_COUNT 3
#define HDAC_DAI_COUNT 2
#define DMIC_DAI_COUNT 2
......@@ -231,9 +229,11 @@ static int skl_hda_audio_probe(struct platform_device *pdev)
card->disable_route_checks = true;
if (mach->mach_params.dmic_num > 0) {
snprintf(hda_soc_components, sizeof(hda_soc_components),
"cfg-dmics:%d", mach->mach_params.dmic_num);
card->components = hda_soc_components;
card->components = devm_kasprintf(card->dev, GFP_KERNEL,
"cfg-dmics:%d",
mach->mach_params.dmic_num);
if (!card->components)
return -ENOMEM;
}
ret = devm_snd_soc_register_card(&pdev->dev, card);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment