ASoC: SOF: Intel: HDA: don't keep a temporary variable
authorGuennadi Liakhovetski <guennadi.liakhovetski@linux.intel.com>
Mon, 8 Feb 2021 23:33:35 +0000 (17:33 -0600)
committerMark Brown <broonie@kernel.org>
Wed, 10 Feb 2021 17:22:53 +0000 (17:22 +0000)
fixup_tplg_name() doesn't need to keep the string, allocated for
filename - it's temporary.

Reviewed-by: Kai Vehmanen <kai.vehmanen@linux.intel.com>
Signed-off-by: Guennadi Liakhovetski <guennadi.liakhovetski@linux.intel.com>
Signed-off-by: Pierre-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: Mark Brown <broonie@kernel.org>
sound/soc/sof/intel/hda.c

index 7ae2c2c..bd1cbef 100644 (file)
@@ -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;
 }