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

ASoC: SOF: sof-client-probes: 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-4-peter.ujfalusi@linux.intel.com


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

sound/soc/sof/sof-client-probes.c

+8 −6
Original line number Diff line number Diff line
@@ -218,12 +218,7 @@ static ssize_t sof_probes_dfs_points_read(struct file *file, char __user *to, 


	ret = ipc->points_info(cdev, &desc, &num_desc);

	if (ret < 0)

		goto exit;



	pm_runtime_mark_last_busy(dev);

	err = pm_runtime_put_autosuspend(dev);

	if (err < 0)

		dev_err_ratelimited(dev, "debugfs read failed to idle %d\n", err);

		goto pm_error;



	for (i = 0; i < num_desc; i++) {

		offset = strlen(buf);
@@ -241,6 +236,13 @@ static ssize_t sof_probes_dfs_points_read(struct file *file, char __user *to, 
	ret = simple_read_from_buffer(to, count, ppos, buf, strlen(buf));



	kfree(desc);



pm_error:

	pm_runtime_mark_last_busy(dev);

	err = pm_runtime_put_autosuspend(dev);

	if (err < 0)

		dev_err_ratelimited(dev, "debugfs read failed to idle %d\n", err);



exit:

	kfree(buf);

	return ret;