diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2022-07-28 12:31:53 +1000 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2022-07-28 12:31:53 +1000 |
| commit | 66b707a8b08d7139748f6c3f50772ae75295ebef (patch) | |
| tree | 361fade9bd5c30a8cd201dec1d70718d2abd1ed9 /sound/soc/sof/intel/atom.c | |
| parent | 628a86d90c785dc5dc1d8e4dc3b4a1ba618090df (diff) | |
| parent | 1b9d1dbb300120da0dd9bf140e31e0a1842c1991 (diff) | |
Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git
Diffstat (limited to 'sound/soc/sof/intel/atom.c')
| -rw-r--r-- | sound/soc/sof/intel/atom.c | 16 |
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; } |