diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2018-04-07 16:46:56 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2018-04-07 16:46:56 -0700 |
| commit | 4b3f1a151571985f7c9964260db1c31e056a67e4 (patch) | |
| tree | 34f4dcdd36dbeb8bf3c6919f9740dc65273ddd2e /include | |
| parent | 706ffc8c26432432fcd6d8a02708b40852bd0bd2 (diff) | |
| parent | ed807f6aaf787b83885a571268c5d803068f60a6 (diff) | |
| download | linux-4b3f1a151571985f7c9964260db1c31e056a67e4.tar.gz linux-4b3f1a151571985f7c9964260db1c31e056a67e4.tar.bz2 linux-4b3f1a151571985f7c9964260db1c31e056a67e4.zip | |
Merge branch 'next-tpm' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security
Pull TPM updates from James Morris:
"This release contains only bug fixes. There are no new major features
added"
* 'next-tpm' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security:
tpm: fix intermittent failure with self tests
tpm: add retry logic
tpm: self test failure should not cause suspend to fail
tpm2: add longer timeouts for creation commands.
tpm_crb: use __le64 annotated variable for response buffer address
tpm: fix buffer type in tpm_transmit_cmd
tpm: tpm-interface: fix tpm_transmit/_cmd kdoc
tpm: cmd_ready command can be issued only after granting locality
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/tpm.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/linux/tpm.h b/include/linux/tpm.h index bcdd3790e94d..06639fb6ab85 100644 --- a/include/linux/tpm.h +++ b/include/linux/tpm.h @@ -44,7 +44,7 @@ struct tpm_class_ops { bool (*update_timeouts)(struct tpm_chip *chip, unsigned long *timeout_cap); int (*request_locality)(struct tpm_chip *chip, int loc); - void (*relinquish_locality)(struct tpm_chip *chip, int loc); + int (*relinquish_locality)(struct tpm_chip *chip, int loc); void (*clk_enable)(struct tpm_chip *chip, bool value); }; |