diff options
| author |   Jarkko Sakkinen <jarkko.sakkinen@linux.intel.com> | 2016-09-02 02:36:58 +0300 |
|---|---|---|
| committer |   James Morris <james.l.morris@oracle.com> | 2016-09-03 08:27:37 +1000 |
| commit | 4a29b3484f857ff350f203a2d9bf3b428c9e0bf2 (patch) | |
| tree | f78f2ae46792d54a97b5328724499f1181aef429 /drivers/char | |
| parent | x86/paravirt: Do not trace _paravirt_ident_*() functions (diff) | |
| download | linux-dev-4a29b3484f857ff350f203a2d9bf3b428c9e0bf2.tar.xz linux-dev-4a29b3484f857ff350f203a2d9bf3b428c9e0bf2.zip | |
tpm: invalid self test error message
The driver emits invalid self test error message even though the init
succeeds.
Signed-off-by: Jarkko Sakkinen <jarkko.sakkinen@linux.intel.com>
Fixes: cae8b441fc20 ("tpm: Factor out common startup code")
Reviewed-by: James Morris <james.l.morris@oracle.com>
Signed-off-by: James Morris <james.l.morris@oracle.com>
Diffstat (limited to 'drivers/char')
| -rw-r--r-- | drivers/char/tpm/tpm2-cmd.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/char/tpm/tpm2-cmd.c b/drivers/char/tpm/tpm2-cmd.c index 08c7e23ed535..0c75c3f1689f 100644 --- a/drivers/char/tpm/tpm2-cmd.c +++ b/drivers/char/tpm/tpm2-cmd.c @@ -957,7 +957,7 @@ int tpm2_auto_startup(struct tpm_chip *chip) goto out; rc = tpm2_do_selftest(chip); - if (rc != TPM2_RC_INITIALIZE) { + if (rc != 0 && rc != TPM2_RC_INITIALIZE) { dev_err(&chip->dev, "TPM self test failed\n"); goto out; } @@ -974,7 +974,6 @@ int tpm2_auto_startup(struct tpm_chip *chip) } } - return rc; out: if (rc > 0) rc = -ENODEV; |