diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2016-09-02 15:33:54 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2016-09-02 15:33:54 -0700 |
| commit | 0ddc9e5a112489e1703143ad75b44fc57f9ac25a (patch) | |
| tree | cff655135a8b06d9b36293b0f83e8c946b7db747 | |
| parent | 601b58699440b421756e5a2b8f3f2211879dd94d (diff) | |
| parent | 4a29b3484f857ff350f203a2d9bf3b428c9e0bf2 (diff) | |
| download | lwn-0ddc9e5a112489e1703143ad75b44fc57f9ac25a.tar.gz lwn-0ddc9e5a112489e1703143ad75b44fc57f9ac25a.zip | |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security
Pull TPM bugfix from James Morris.
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security:
tpm: invalid self test error message
| -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; |