summaryrefslogtreecommitdiff
path: root/sound/soc/sof/intel/atom.c
diff options
context:
space:
mode:
authorMark Brown <broonie@kernel.org>2022-07-19 21:16:21 +0300
committerMark Brown <broonie@kernel.org>2022-07-19 21:16:21 +0300
commit16824dffcf616b829e4aca3a06f45c0ad743a99c (patch)
tree0d1262e3a1eba783ec175aead0049cbce38d3020 /sound/soc/sof/intel/atom.c
parent09f852894553ac72e25a6b6012a1f5ff34be5be5 (diff)
parent321add801bcd186c6b5477c0857521e127dbf016 (diff)
downloadlinux-16824dffcf616b829e4aca3a06f45c0ad743a99c.tar.xz
ASoC: SOF: Intel: updates and cleanups
Merge series from Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>: Set of updates for IPC3, IPC4, MTL support and cleanups for the topology filename override which was broken for HDaudio platforms.
Diffstat (limited to 'sound/soc/sof/intel/atom.c')
-rw-r--r--sound/soc/sof/intel/atom.c16
1 files changed, 8 insertions, 8 deletions
diff --git a/sound/soc/sof/intel/atom.c b/sound/soc/sof/intel/atom.c
index ff5900b155dc..bd9789b483b1 100644
--- a/sound/soc/sof/intel/atom.c
+++ b/sound/soc/sof/intel/atom.c
@@ -274,22 +274,22 @@ static const char *fixup_tplg_name(struct snd_sof_dev *sdev,
const char *ssp_str)
{
const char *tplg_filename = NULL;
- char *filename;
- char *split_ext;
+ const char *split_ext;
+ char *filename, *tmp;
- 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.tplg",
split_ext, ssp_str);
- if (!tplg_filename)
- return NULL;
- }
+ kfree(filename);
+
return tplg_filename;
}