Skip to content

Commit 7f048b2

Browse files
Dan Carpenterandersson
authored andcommitted
firmware: qcom: scm: Fix error code in probe()
Set the error code if devm_qcom_tzmem_pool_new() fails. Don't return success. Fixes: 1e76b54 ("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>
1 parent 1ac98d6 commit 7f048b2

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

drivers/firmware/qcom/qcom_scm.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2301,8 +2301,8 @@ static int qcom_scm_probe(struct platform_device *pdev)
23012301

23022302
__scm->mempool = devm_qcom_tzmem_pool_new(__scm->dev, &pool_config);
23032303
if (IS_ERR(__scm->mempool)) {
2304-
dev_err_probe(__scm->dev, PTR_ERR(__scm->mempool),
2305-
"Failed to create the SCM memory pool\n");
2304+
ret = dev_err_probe(__scm->dev, PTR_ERR(__scm->mempool),
2305+
"Failed to create the SCM memory pool\n");
23062306
goto err;
23072307
}
23082308

0 commit comments

Comments
 (0)