Skip to content

ASoC: SOF: loader: don't use devm_kasprintf for fw_filename #819

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
plbossart merged 1 commit into from
Apr 12, 2019
Merged

ASoC: SOF: loader: don't use devm_kasprintf for fw_filename #819

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 6 additions & 4 deletions sound/soc/sof/loader.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -260,10 +260,9 @@ int snd_sof_load_firmware_raw(struct snd_sof_dev *sdev)
if (plat_data->fw)
return 0;

fw_filename = devm_kasprintf(sdev->dev, GFP_KERNEL,
"%s/%s",
plat_data->fw_filename_prefix,
plat_data->fw_filename);
fw_filename = kasprintf(GFP_KERNEL, "%s/%s",
plat_data->fw_filename_prefix,
plat_data->fw_filename);
if (!fw_filename)
return -ENOMEM;

Expand All @@ -273,6 +272,9 @@ int snd_sof_load_firmware_raw(struct snd_sof_dev *sdev)
dev_err(sdev->dev, "error: request firmware %s failed err: %d\n",
fw_filename, ret);
}

kfree(fw_filename);

return ret;
}
EXPORT_SYMBOL(snd_sof_load_firmware_raw);
Expand Down