diff options
| author | James Morris <james.morris@microsoft.com> | 2018-03-24 07:48:26 +1100 |
|---|---|---|
| committer | James Morris <james.morris@microsoft.com> | 2018-03-24 07:48:26 +1100 |
| commit | ed807f6aaf787b83885a571268c5d803068f60a6 (patch) | |
| tree | 0c9a3aeaca58ae509d3bd686324a67656db240f8 /include/linux | |
| parent | 5893ed18a26d1f56b97c0290b0cbbc2d49d6de28 (diff) | |
| parent | 2be8ffed093b91536d52b5cd2c99b52f605c9ba6 (diff) | |
| download | cachepc-linux-ed807f6aaf787b83885a571268c5d803068f60a6.tar.gz cachepc-linux-ed807f6aaf787b83885a571268c5d803068f60a6.zip | |
Merge tag 'tpmdd-next-20180323' of git://git.infradead.org/users/jjs/linux-tpmdd into next-tpm
tpmdd updates for Linux 4.17 from Jarkko:
"This release contains only bug fixes. There are no new major features
added."
Diffstat (limited to 'include/linux')
| -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); }; |