summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorXiu Jianfeng <xiujianfeng@huawei.com>2022-03-18 14:02:01 +0800
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2022-06-06 08:24:22 +0200
commit24f43b142785f768c96754bacfc58fa69708cf6f (patch)
tree4b639ecbecde4bc56a83cae5b26b7cff7aece3f8
parentda6e23e16a27a3c0cc6652034f2f2c10e2533b54 (diff)
downloadlinux-stable-24f43b142785f768c96754bacfc58fa69708cf6f.tar.gz
linux-stable-24f43b142785f768c96754bacfc58fa69708cf6f.tar.bz2
linux-stable-24f43b142785f768c96754bacfc58fa69708cf6f.zip
tpm: ibmvtpm: Correct the return value in tpm_ibmvtpm_probe()
commit d0dc1a7100f19121f6e7450f9cdda11926aa3838 upstream. Currently it returns zero when CRQ response timed out, it should return an error code instead. Fixes: d8d74ea3c002 ("tpm: ibmvtpm: Wait for buffer to be set before proceeding") Signed-off-by: Xiu Jianfeng <xiujianfeng@huawei.com> Reviewed-by: Stefan Berger <stefanb@linux.ibm.com> Acked-by: Jarkko Sakkinen <jarkko@kernel.org> Signed-off-by: Jarkko Sakkinen <jarkko@kernel.org> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-rw-r--r--drivers/char/tpm/tpm_ibmvtpm.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/char/tpm/tpm_ibmvtpm.c b/drivers/char/tpm/tpm_ibmvtpm.c
index 3ba67bc6baba..80647eb071fd 100644
--- a/drivers/char/tpm/tpm_ibmvtpm.c
+++ b/drivers/char/tpm/tpm_ibmvtpm.c
@@ -692,6 +692,7 @@ static int tpm_ibmvtpm_probe(struct vio_dev *vio_dev,
if (!wait_event_timeout(ibmvtpm->crq_queue.wq,
ibmvtpm->rtce_buf != NULL,
HZ)) {
+ rc = -ENODEV;
dev_err(dev, "CRQ response timed out\n");
goto init_irq_cleanup;
}