| Message ID | 20210126014753.340299-1-stefanb@linux.vnet.ibm.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | [v2] tpm: ibmvtpm: fix error return code in tpm_ibmvtpm_probe() | expand |
On Mon, Jan 25, 2021 at 08:47:53PM -0500, Stefan Berger wrote: > From: Stefan Berger <stefanb@linux.ibm.com> > > Return error code -ETIMEDOUT rather than '0' when waiting for the > rtce_buf to be set has timed out. > > Fixes: d8d74ea3c002 ("tpm: ibmvtpm: Wait for buffer to be set before proceeding") > Reported-by: Hulk Robot <hulkci@huawei.com> > Signed-off-by: Wang Hai <wanghai38@huawei.com> > Signed-off-by: Stefan Berger <stefanb@linux.ibm.com> > --- Reviewed-by: Jarkko Sakkinen <jarkko@kernel.org> Thanks! Should I add Cc: stable@vger.kernel.org to this? /Jarkko > 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 994385bf37c0..813eb2cac0ce 100644 > --- a/drivers/char/tpm/tpm_ibmvtpm.c > +++ b/drivers/char/tpm/tpm_ibmvtpm.c > @@ -687,6 +687,7 @@ static int tpm_ibmvtpm_probe(struct vio_dev *vio_dev, > ibmvtpm->rtce_buf != NULL, > HZ)) { > dev_err(dev, "CRQ response timed out\n"); > + rc = -ETIMEDOUT; > goto init_irq_cleanup; > } > > -- > 2.25.4 > >
On 1/29/21 12:35 PM, Jarkko Sakkinen wrote: > On Mon, Jan 25, 2021 at 08:47:53PM -0500, Stefan Berger wrote: >> From: Stefan Berger <stefanb@linux.ibm.com> >> >> Return error code -ETIMEDOUT rather than '0' when waiting for the >> rtce_buf to be set has timed out. >> >> Fixes: d8d74ea3c002 ("tpm: ibmvtpm: Wait for buffer to be set before proceeding") >> Reported-by: Hulk Robot <hulkci@huawei.com> >> Signed-off-by: Wang Hai <wanghai38@huawei.com> >> Signed-off-by: Stefan Berger <stefanb@linux.ibm.com> >> --- > Reviewed-by: Jarkko Sakkinen <jarkko@kernel.org> > > Thanks! Should I add > > Cc: stable@vger.kernel.org to this? Yes, that would be good! Thank you! Stefan > > /Jarkko > > >> 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 994385bf37c0..813eb2cac0ce 100644 >> --- a/drivers/char/tpm/tpm_ibmvtpm.c >> +++ b/drivers/char/tpm/tpm_ibmvtpm.c >> @@ -687,6 +687,7 @@ static int tpm_ibmvtpm_probe(struct vio_dev *vio_dev, >> ibmvtpm->rtce_buf != NULL, >> HZ)) { >> dev_err(dev, "CRQ response timed out\n"); >> + rc = -ETIMEDOUT; >> goto init_irq_cleanup; >> } >> >> -- >> 2.25.4 >> >>
On Fri, 2021-01-29 at 13:57 -0500, Stefan Berger wrote: > On 1/29/21 12:35 PM, Jarkko Sakkinen wrote: > > On Mon, Jan 25, 2021 at 08:47:53PM -0500, Stefan Berger wrote: > > > From: Stefan Berger <stefanb@linux.ibm.com> > > > > > > Return error code -ETIMEDOUT rather than '0' when waiting for the > > > rtce_buf to be set has timed out. > > > > > > Fixes: d8d74ea3c002 ("tpm: ibmvtpm: Wait for buffer to be set before proceeding") > > > Reported-by: Hulk Robot <hulkci@huawei.com> > > > Signed-off-by: Wang Hai <wanghai38@huawei.com> > > > Signed-off-by: Stefan Berger <stefanb@linux.ibm.com> > > > --- > > Reviewed-by: Jarkko Sakkinen <jarkko@kernel.org> > > > > Thanks! Should I add > > > > Cc: stable@vger.kernel.org to this? > > Yes, that would be good! Thank you! OK, it's applied. > Stefan /Jarkko
diff --git a/drivers/char/tpm/tpm_ibmvtpm.c b/drivers/char/tpm/tpm_ibmvtpm.c index 994385bf37c0..813eb2cac0ce 100644 --- a/drivers/char/tpm/tpm_ibmvtpm.c +++ b/drivers/char/tpm/tpm_ibmvtpm.c @@ -687,6 +687,7 @@ static int tpm_ibmvtpm_probe(struct vio_dev *vio_dev, ibmvtpm->rtce_buf != NULL, HZ)) { dev_err(dev, "CRQ response timed out\n"); + rc = -ETIMEDOUT; goto init_irq_cleanup; }