Commit 46d22bfd authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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
parents 3ec3f5fc 08d08e2e

drivers/char/tpm/tpm_ibmvtpm.c

+4 −0
Original line number Diff line number Diff line
@@ -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);