Skip to content

[SQUASHME]ASoC: sof: topology: fix memleak when errror happen #40

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
Jul 21, 2018
Merged

[SQUASHME]ASoC: sof: topology: fix memleak when errror happen #40

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
6 changes: 5 additions & 1 deletion sound/soc/sof/topology.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -721,6 +721,7 @@ static int sof_control_load(struct snd_soc_component *scomp, int index,
default:
dev_warn(sdev->dev, "control type not supported %d:%d:%d\n",
hdr->ops.get, hdr->ops.put, hdr->ops.info);
kfree(scontrol);
return 0;
}

Expand Down Expand Up @@ -1255,8 +1256,10 @@ static int sof_widget_ready(struct snd_soc_component *scomp, int index,
case snd_soc_dapm_dai_in:
case snd_soc_dapm_dai_out:
dai = kzalloc(sizeof(*dai), GFP_KERNEL);
if (!dai)
if (!dai) {
kfree(swidget);
return -ENOMEM;
}

ret = sof_widget_load_dai(scomp, index, swidget, tw, &reply,
dai);
Expand Down Expand Up @@ -1320,6 +1323,7 @@ static int sof_widget_ready(struct snd_soc_component *scomp, int index,
"error: DSP failed to add widget id %d type %d name : %s stream %s reply %d\n",
tw->shift, swidget->id, tw->name,
tw->sname ? tw->sname : "none", reply.rhdr.error);
kfree(swidget);
return ret;
}

Expand Down