diff options
| author |   Linus Torvalds <torvalds@linux-foundation.org> | 2024-08-28 14:55:48 +1200 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2024-08-28 14:55:48 +1200 |
| commit | 46d22bfdf0bc76429f596c58ca74a8f67d0f6251 (patch) | |
| tree | 31d93b21ce3fffd03ac8c5c7b7b1e1a4ab7c2bb1 | |
| parent | Merge tag 'livepatching-for-6.11-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/livepatching/livepatching (diff) | |
| parent | tpm: ibmvtpm: Call tpm2_sessions_init() to initialize session support (diff) | |
| download | wireguard-linux-46d22bfdf0bc76429f596c58ca74a8f67d0f6251.tar.xz wireguard-linux-46d22bfdf0bc76429f596c58ca74a8f67d0f6251.zip | |
Merge tag 'tpmdd-next-6.11-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/jarkko/linux-tpmdd
Pull TPM fix from Jarkko Sakkinen:
"A bug fix for tpm_ibmvtpm driver so that it will take the bus
encryption into use"
* tag 'tpmdd-next-6.11-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/jarkko/linux-tpmdd:
tpm: ibmvtpm: Call tpm2_sessions_init() to initialize session support
| -rw-r--r-- | drivers/char/tpm/tpm_ibmvtpm.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/drivers/char/tpm/tpm_ibmvtpm.c b/drivers/char/tpm/tpm_ibmvtpm.c index d3989b257f42..1e5b107d1f3b 100644 --- a/drivers/char/tpm/tpm_ibmvtpm.c +++ b/drivers/char/tpm/tpm_ibmvtpm.c @@ -698,6 +698,10 @@ static int tpm_ibmvtpm_probe(struct vio_dev *vio_dev, rc = tpm2_get_cc_attrs_tbl(chip); if (rc) goto init_irq_cleanup; + + rc = tpm2_sessions_init(chip); + if (rc) + goto init_irq_cleanup; } return tpm_chip_register(chip); |