shinys000114/linux
1
0
Fork 0
mirror of https://github.com/hardkernel/linux.git synced 2026-06-06 02:50:49 +09:00
Code Issues Packages Projects Releases Wiki Activity

ASoC: SOF: sof-client-probes: fix pm_runtime imbalance in error handling

Browse Source 
[ Upstream commit bc424273c7 ]

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-4-peter.ujfalusi@linux.intel.com
Signed-off-by: Mark Brown <broonie@kernel.org
Signed-off-by: Sasha Levin <sashal@kernel.org>
This commit is contained in:
Pierre-Louis Bossart
2023-05-12 13:33:15 +03:00
committed by Greg Kroah-Hartman
parent 1cc6301dfc
commit eb708aee41
1 changed files with 8 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
sound/soc/sof/sof-client-probes.c
View File

@@ -441,12 +441,7 @@ static ssize_t sof_probes_dfs_points_read(struct file *file, char __user *to,
ret = sof_probes_points_info(cdev, &desc, &num_desc); ret = sof_probes_points_info(cdev, &desc, &num_desc);
if (ret < 0) if (ret < 0)
goto exit; goto 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);
for (i = 0; i < num_desc; i++) { for (i = 0; i < num_desc; i++) {
offset = strlen(buf); offset = strlen(buf);
@@ -464,6 +459,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)); ret = simple_read_from_buffer(to, count, ppos, buf, strlen(buf));
kfree(desc); 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: exit:
kfree(buf); kfree(buf);
return ret; return ret;