Unverified Commit da0fe8fd authored by Pierre-Louis Bossart's avatar Pierre-Louis Bossart Committed by Mark Brown
Browse files

ASoC: SOF: pcm: fix pm_runtime imbalance in error handling 



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

Signed-off-by: default avatarPierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
Reviewed-by: default avatarDaniel Baluta <daniel.baluta@nxp.com>
Reviewed-by: default avatarRanjani Sridharan <ranjani.sridharan@linux.intel.com>
Signed-off-by: default avatarPeter Ujfalusi <peter.ujfalusi@linux.intel.com>
Link: https://lore.kernel.org/r/20230512103315.8921-3-peter.ujfalusi@linux.intel.com


Signed-off-by: default avatarMark Brown <broonie@kernel.org>
parent 3de97586

sound/soc/sof/pcm.c

+6 −5
Original line number Diff line number Diff line
@@ -643,16 +643,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);