Commit 40eb0dcf authored Feb 10, 2022 by Yang Yingliang Committed by Jens Wiklander Feb 14, 2022

tee: optee: fix error return code in probe function



If teedev_open() fails, probe function need return
error code.

Fixes: aceeafef ("optee: use driver internal tee_context for some rpc")
Reported-by: Hulk Robot <hulkci@huawei.com>
Signed-off-by: Yang Yingliang <yangyingliang@huawei.com>
Signed-off-by: Jens Wiklander <jens.wiklander@linaro.org>

parent aceeafef

drivers/tee/optee/ffa_abi.c

+3 −1

Original line number	Diff line number	Diff line
		@@ -860,8 +860,10 @@ static int optee_ffa_probe(struct ffa_device *ffa_dev)
		optee_supp_init(&optee->supp);
		ffa_dev_set_drvdata(ffa_dev, optee);
		ctx = teedev_open(optee->teedev);
		if (IS_ERR(ctx))
		if (IS_ERR(ctx)) {
		rc = PTR_ERR(ctx);
		goto err_rhashtable_free;
		}
		optee->ctx = ctx;
		rc = optee_notif_init(optee, OPTEE_DEFAULT_MAX_NOTIF_VALUE);
		if (rc)

drivers/tee/optee/smc_abi.c

+3 −1

Original line number	Diff line number	Diff line
		@@ -1427,8 +1427,10 @@ static int optee_probe(struct platform_device *pdev)

		platform_set_drvdata(pdev, optee);
		ctx = teedev_open(optee->teedev);
		if (IS_ERR(ctx))
		if (IS_ERR(ctx)) {
		rc = PTR_ERR(ctx);
		goto err_supp_uninit;
		}
		optee->ctx = ctx;
		rc = optee_notif_init(optee, max_notif_value);
		if (rc)