Unverified Commit b9088535 authored by Guennadi Liakhovetski's avatar Guennadi Liakhovetski Committed by Mark Brown
Browse files

ASoC: SOF: Intel: HDA: don't keep a temporary variable 



fixup_tplg_name() doesn't need to keep the string, allocated for
filename - it's temporary.

Reviewed-by: default avatarKai Vehmanen <kai.vehmanen@linux.intel.com>
Signed-off-by: default avatarGuennadi Liakhovetski <guennadi.liakhovetski@linux.intel.com>
Signed-off-by: default avatarPierre-Louis Bossart <pierre-louis.bossart@intel.com>
Link: https://lore.kernel.org/r/20210208233336.59449-11-pierre-louis.bossart@linux.intel.com


Signed-off-by: default avatarMark Brown <broonie@kernel.org>
parent 7aecf597

sound/soc/sof/intel/hda.c

+8 −8
Original line number Diff line number Diff line
@@ -581,22 +581,22 @@ static const char *fixup_tplg_name(struct snd_sof_dev *sdev, 
				   const char *dmic_str)

{

	const char *tplg_filename = NULL;

	char *filename;

	char *split_ext;

	char *filename, *tmp;

	const char *split_ext;



	filename = devm_kstrdup(sdev->dev, sof_tplg_filename, GFP_KERNEL);

	filename = kstrdup(sof_tplg_filename, GFP_KERNEL);

	if (!filename)

		return NULL;



	/* this assumes a .tplg extension */

	split_ext = strsep(&filename, ".");

	if (split_ext) {

	tmp = filename;

	split_ext = strsep(&tmp, ".");

	if (split_ext)

		tplg_filename = devm_kasprintf(sdev->dev, GFP_KERNEL,

					       "%s%s%s.tplg",

					       split_ext, idisp_str, dmic_str);

		if (!tplg_filename)

			return NULL;

	}

	kfree(filename);



	return tplg_filename;

}