A last minute change must have confused PTR_ERR() and ERR_PTR():
drivers/char/tpm/tpm_ftpm_tee.c:236:15: error: incompatible pointer to integer conversion passing 'struct tee_context *' to parameter of type 'long' [-Werror,-Wint-conversion]
if (ERR_PTR(pvt_data->ctx) == -ENOENT)
drivers/char/tpm/tpm_ftpm_tee.c:239:18: error: incompatible pointer to integer conversion passing 'struct tee_context *' to parameter of type 'long' [-Werror,-Wint-conversion]
return ERR_PTR(pvt_data->ctx);
Fixes: c975c3911cc2 ("fTPM: firmware TPM running in TEE")
Signed-off-by: Arnd Bergmann <arnd@xxxxxxxx>
---
drivers/char/tpm/tpm_ftpm_tee.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/drivers/char/tpm/tpm_ftpm_tee.c b/drivers/char/tpm/tpm_ftpm_tee.c
index 74766a4d3280..5679a5af9a96 100644
--- a/drivers/char/tpm/tpm_ftpm_tee.c
+++ b/drivers/char/tpm/tpm_ftpm_tee.c
@@ -233,10 +233,10 @@ static int ftpm_tee_probe(struct platform_device *pdev)
pvt_data->ctx = tee_client_open_context(NULL, ftpm_tee_match, NULL,
NULL);
if (IS_ERR(pvt_data->ctx)) {
- if (ERR_PTR(pvt_data->ctx) == -ENOENT)
+ if (PTR_ERR(pvt_data->ctx) == -ENOENT)
return -EPROBE_DEFER;
dev_err(dev, "%s: tee_client_open_context failed\n", __func__);
- return ERR_PTR(pvt_data->ctx);
+ return PTR_ERR(pvt_data->ctx);
}
/* Open a session with fTPM TA */
--
2.20.0
