diff options
| author | Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org> | 2023-05-17 18:37:36 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2023-06-28 11:14:21 +0200 |
| commit | 6b448cbc3d9e751ffe92c8989392df62eab16e27 (patch) | |
| tree | 0ac696afa10c8a88d7e4bad06ae7310dd320caad /drivers | |
| parent | a04961316a47b006656f09f800c92cb1c73e7d35 (diff) | |
| download | linux-stable-6b448cbc3d9e751ffe92c8989392df62eab16e27.tar.gz linux-stable-6b448cbc3d9e751ffe92c8989392df62eab16e27.tar.bz2 linux-stable-6b448cbc3d9e751ffe92c8989392df62eab16e27.zip | |
soundwire: qcom: add proper error paths in qcom_swrm_startup()
[ Upstream commit 99e09b9c0ab43346c52f2787ca4e5c4b1798362e ]
Reverse actions in qcom_swrm_startup() error paths to avoid leaking
stream memory and keeping runtime PM unbalanced.
Signed-off-by: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org>
Reviewed-by: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
Link: https://lore.kernel.org/r/20230517163736.997553-1-krzysztof.kozlowski@linaro.org
Signed-off-by: Vinod Koul <vkoul@kernel.org>
Signed-off-by: Sasha Levin <sashal@kernel.org>
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/soundwire/qcom.c | 17 |
1 files changed, 13 insertions, 4 deletions
diff --git a/drivers/soundwire/qcom.c b/drivers/soundwire/qcom.c index 30575ed20947..0dcdbd4e1ec3 100644 --- a/drivers/soundwire/qcom.c +++ b/drivers/soundwire/qcom.c @@ -1098,8 +1098,10 @@ static int qcom_swrm_startup(struct snd_pcm_substream *substream, } sruntime = sdw_alloc_stream(dai->name); - if (!sruntime) - return -ENOMEM; + if (!sruntime) { + ret = -ENOMEM; + goto err_alloc; + } ctrl->sruntime[dai->id] = sruntime; @@ -1109,12 +1111,19 @@ static int qcom_swrm_startup(struct snd_pcm_substream *substream, if (ret < 0 && ret != -ENOTSUPP) { dev_err(dai->dev, "Failed to set sdw stream on %s\n", codec_dai->name); - sdw_release_stream(sruntime); - return ret; + goto err_set_stream; } } return 0; + +err_set_stream: + sdw_release_stream(sruntime); +err_alloc: + pm_runtime_mark_last_busy(ctrl->dev); + pm_runtime_put_autosuspend(ctrl->dev); + + return ret; } static void qcom_swrm_shutdown(struct snd_pcm_substream *substream, |