Skip to content

ASoC: SOF: pcm: fix resource leak in hw_free #1194

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
Sep 16, 2019
Merged

ASoC: SOF: pcm: fix resource leak in hw_free #1194

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
20 changes: 10 additions & 10 deletions sound/soc/sof/pcm.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -244,7 +244,7 @@ static int sof_pcm_hw_free(struct snd_pcm_substream *substream)
snd_soc_rtdcom_lookup(rtd, DRV_NAME);
struct snd_sof_dev *sdev = snd_soc_component_get_drvdata(component);
struct snd_sof_pcm *spcm;
int ret;
int ret, err = 0;

/* nothing to do for BE */
if (rtd->dai_link->no_pcm)
Expand All @@ -254,26 +254,26 @@ static int sof_pcm_hw_free(struct snd_pcm_substream *substream)
if (!spcm)
return -EINVAL;

if (!spcm->prepared[substream->stream])
return 0;

dev_dbg(sdev->dev, "pcm: free stream %d dir %d\n", spcm->pcm.pcm_id,
substream->stream);

ret = sof_pcm_dsp_pcm_free(substream, sdev, spcm);
if (spcm->prepared[substream->stream]) {
Comment thread
plbossart marked this conversation as resolved.
Resolved
ret = sof_pcm_dsp_pcm_free(substream, sdev, spcm);
if (ret < 0)
err = ret;
}

snd_pcm_lib_free_pages(substream);

cancel_work_sync(&spcm->stream[substream->stream].period_elapsed_work);

if (ret < 0)
return ret;

ret = snd_sof_pcm_platform_hw_free(sdev, substream);
if (ret < 0)
if (ret < 0) {
dev_err(sdev->dev, "error: platform hw free failed\n");
err = ret;
}

return ret;
return err;
}

static int sof_pcm_prepare(struct snd_pcm_substream *substream)
Expand Down