Skip to content

Commit

Permalink
ASoC: SOF: pcm: fix pm_runtime imbalance in error handling
Browse files Browse the repository at this point in the history
[ Upstream commit da0fe8f ]

When an error occurs, we need to make sure the device can pm_runtime
suspend instead of keeping it active.

Signed-off-by: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com
Reviewed-by: Daniel Baluta <daniel.baluta@nxp.com
Reviewed-by: Ranjani Sridharan <ranjani.sridharan@linux.intel.com
Signed-off-by: Peter Ujfalusi <peter.ujfalusi@linux.intel.com
Link: https://lore.kernel.org/r/20230512103315.8921-3-peter.ujfalusi@linux.intel.com
Signed-off-by: Mark Brown <broonie@kernel.org
Signed-off-by: Sasha Levin <sashal@kernel.org>
  • Loading branch information
plbossart authored and gregkh committed Jun 9, 2023
1 parent a6637d5 commit 1cc6301
Showing 1 changed file with 6 additions and 5 deletions.
11 changes: 6 additions & 5 deletions sound/soc/sof/pcm.c
Original file line number Diff line number Diff line change
Expand Up @@ -619,16 +619,17 @@ static int sof_pcm_probe(struct snd_soc_component *component)
"%s/%s",
plat_data->tplg_filename_prefix,
plat_data->tplg_filename);
if (!tplg_filename)
return -ENOMEM;
if (!tplg_filename) {
ret = -ENOMEM;
goto pm_error;
}

ret = snd_sof_load_topology(component, tplg_filename);
if (ret < 0) {
if (ret < 0)
dev_err(component->dev, "error: failed to load DSP topology %d\n",
ret);
return ret;
}

pm_error:
pm_runtime_mark_last_busy(component->dev);
pm_runtime_put_autosuspend(component->dev);

Expand Down

0 comments on commit 1cc6301

Please sign in to comment.