]> git.ipfire.org Git - thirdparty/kernel/linux.git/commitdiff
firmware: qcom: scm: Fix error code in probe()
authorDan Carpenter <dan.carpenter@linaro.org>
Wed, 15 Jan 2025 06:52:53 +0000 (09:52 +0300)
committerBjorn Andersson <andersson@kernel.org>
Wed, 5 Feb 2025 03:16:02 +0000 (21:16 -0600)
Set the error code if devm_qcom_tzmem_pool_new() fails.  Don't return
success.

Fixes: 1e76b546e6fc ("firmware: qcom: scm: Cleanup global '__scm' on probe failures")
Signed-off-by: Dan Carpenter <dan.carpenter@linaro.org>
Reviewed-by: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org>
Link: https://lore.kernel.org/r/a0845467-4f83-4070-ab1e-ff7e6764609f@stanley.mountain
Signed-off-by: Bjorn Andersson <andersson@kernel.org>
drivers/firmware/qcom/qcom_scm.c

index f0569bb9411f7175c97a4ede50b3775fece330cf..fc4d67e4c4a67efc77e0135c06db47bc14d0aeaa 100644 (file)
@@ -2301,8 +2301,8 @@ static int qcom_scm_probe(struct platform_device *pdev)
 
        __scm->mempool = devm_qcom_tzmem_pool_new(__scm->dev, &pool_config);
        if (IS_ERR(__scm->mempool)) {
-               dev_err_probe(__scm->dev, PTR_ERR(__scm->mempool),
-                             "Failed to create the SCM memory pool\n");
+               ret = dev_err_probe(__scm->dev, PTR_ERR(__scm->mempool),
+                                   "Failed to create the SCM memory pool\n");
                goto err;
        }