firmware: qcom: scm: Fix error code in probe()

[ Upstream commit 7f048b202333b967782a98aa21bb3354dc379bbf ]

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>
Signed-off-by: Sasha Levin <sashal@kernel.org>

diff --git a/drivers/firmware/qcom/qcom_scm.c b/drivers/firmware/qcom/qcom_scm.c
index 2e093c39b610ae1cecdc7e0421ce63eff05aeb7a..23aefbf6fca588f257e83fc35c759319ef99efa8 100644 (file)
--- a/drivers/firmware/qcom/qcom_scm.c
+++ b/drivers/firmware/qcom/qcom_scm.c
@@ -2054,8 +2054,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;
        }