projects
/
cascardo
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge git://git.kernel.org/pub/scm/linux/kernel/git/pablo/nf
[cascardo/linux.git]
/
drivers
/
char
/
tpm
/
tpm2-cmd.c
diff --git
a/drivers/char/tpm/tpm2-cmd.c
b/drivers/char/tpm/tpm2-cmd.c
index
08c7e23
..
0c75c3f
100644
(file)
--- 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;