diff options
| author | Mark Brown <broonie@kernel.org> | 2025-07-07 21:02:59 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2025-07-07 21:02:59 +0100 |
| commit | bb96a315b4d84904edd2dae17910f10022ab71d5 (patch) | |
| tree | e858237bd1335da828da7611979931fe890e33e6 /sound/soc/sof | |
| parent | 12826a49f029cd7ed794b1973ee31922f0e08e6f (diff) | |
| parent | 08dc0f5cc26a203e8008c38d9b436c079e7dbb45 (diff) | |
ASoC: soc-dapm: cleanups
Merge series from Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>:
This is prepare to hiding snd_soc_dapm_context inside soc-dapm.c
Diffstat (limited to 'sound/soc/sof')
| -rw-r--r-- | sound/soc/sof/intel/hda.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/sound/soc/sof/intel/hda.c b/sound/soc/sof/intel/hda.c index 5347c433ac8e..c387efec41e9 100644 --- a/sound/soc/sof/intel/hda.c +++ b/sound/soc/sof/intel/hda.c @@ -1262,11 +1262,11 @@ static int check_tplg_quirk_mask(struct snd_soc_acpi_mach *mach) return 0; } -static char *remove_file_ext(const char *tplg_filename) +static char *remove_file_ext(struct device *dev, const char *tplg_filename) { char *filename, *tmp; - filename = kstrdup(tplg_filename, GFP_KERNEL); + filename = devm_kstrdup(dev, tplg_filename, GFP_KERNEL); if (!filename) return NULL; @@ -1350,7 +1350,7 @@ struct snd_soc_acpi_mach *hda_machine_select(struct snd_sof_dev *sdev) */ if (!sof_pdata->tplg_filename) { /* remove file extension if it exists */ - tplg_filename = remove_file_ext(mach->sof_tplg_filename); + tplg_filename = remove_file_ext(sdev->dev, mach->sof_tplg_filename); if (!tplg_filename) return NULL; |