Skip to content

Commit 8e67140

Browse files
Dan CarpenterSasha Levin
authored andcommitted
firmware: qcom: scm: Fix error code in probe()
[ Upstream commit 7f048b2 ] 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> Signed-off-by: Sasha Levin <sashal@kernel.org>
1 parent f491dd2 commit 8e67140

1 file changed

Lines changed: 2 additions & 2 deletions

File tree

drivers/firmware/qcom/qcom_scm.c

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

20552055
__scm->mempool = devm_qcom_tzmem_pool_new(__scm->dev, &pool_config);
20562056
if (IS_ERR(__scm->mempool)) {
2057-
dev_err_probe(__scm->dev, PTR_ERR(__scm->mempool),
2058-
"Failed to create the SCM memory pool\n");
2057+
ret = dev_err_probe(__scm->dev, PTR_ERR(__scm->mempool),
2058+
"Failed to create the SCM memory pool\n");
20592059
goto err;
20602060
}
20612061

0 commit comments

Comments
 (0)