| Message ID | 20220318060201.50488-1-xiujianfeng@huawei.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | [-next] tpm: ibmvtpm: Correct the return value in tpm_ibmvtpm_probe() | expand |
On 3/18/22 02:02, Xiu Jianfeng wrote: > 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> > --- > drivers/char/tpm/tpm_ibmvtpm.c | 1 + > 1 file changed, 1 insertion(+) > > diff --git a/drivers/char/tpm/tpm_ibmvtpm.c b/drivers/char/tpm/tpm_ibmvtpm.c > index 3af4c07a9342..d3989b257f42 100644 > --- a/drivers/char/tpm/tpm_ibmvtpm.c > +++ b/drivers/char/tpm/tpm_ibmvtpm.c > @@ -681,6 +681,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; > }
On Fri, Mar 18, 2022 at 02:02:01PM +0800, Xiu Jianfeng wrote: > 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> > --- > drivers/char/tpm/tpm_ibmvtpm.c | 1 + > 1 file changed, 1 insertion(+) > > diff --git a/drivers/char/tpm/tpm_ibmvtpm.c b/drivers/char/tpm/tpm_ibmvtpm.c > index 3af4c07a9342..d3989b257f42 100644 > --- a/drivers/char/tpm/tpm_ibmvtpm.c > +++ b/drivers/char/tpm/tpm_ibmvtpm.c > @@ -681,6 +681,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; > } > -- > 2.17.1 > Acked-by: Jarkko Sakkinen <jarkko@kernel.org> This will require reviewed by from someone who knows this driver better. BR, Jarkko
On Fri, Mar 18, 2022 at 09:54:46AM -0400, Stefan Berger wrote: > > > On 3/18/22 02:02, Xiu Jianfeng wrote: > > 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> Thank you, I applied this. BR, Jarkko
diff --git a/drivers/char/tpm/tpm_ibmvtpm.c b/drivers/char/tpm/tpm_ibmvtpm.c index 3af4c07a9342..d3989b257f42 100644 --- a/drivers/char/tpm/tpm_ibmvtpm.c +++ b/drivers/char/tpm/tpm_ibmvtpm.c @@ -681,6 +681,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; }
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> --- drivers/char/tpm/tpm_ibmvtpm.c | 1 + 1 file changed, 1 insertion(+)