tpm: ibmvtpm: Correct the return value in tpm_ibmvtpm_probe()

Xiu Jianfeng · gregkh · commit ebbbffae71e2 · 2022-06-06T08:42:44.000+02:00
commit d0dc1a7 upstream. Currently it returns zero when CRQ response timed out, it should return an error code instead. Fixes: d8d74ea ("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>
diff --git a/drivers/char/tpm/tpm_ibmvtpm.c b/drivers/char/tpm/tpm_ibmvtpm.c
@@ -683,6 +683,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;
 	}

Original file line number	Diff line number	Diff line change
`@@ -683,6 +683,7 @@ static int tpm_ibmvtpm_probe(struct vio_dev *vio_dev,`
`683`	`683`	`if (!wait_event_timeout(ibmvtpm->crq_queue.wq,`
`684`	`684`	`ibmvtpm->rtce_buf != NULL,`
`685`	`685`	`HZ)) {`
	`686`	`+ rc = -ENODEV;`
`686`	`687`	`dev_err(dev, "CRQ response timed out\n");`
`687`	`688`	`goto init_irq_cleanup;`
`688`	`689`	`}`