Commit 4cb9dc10 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'tpmdd-next-6.11-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/jarkko/linux-tpmdd 

Pull tpm updates from Jarkko Sakkinen:
 "A couple of bug fixes.

  No new features are coming for this release. I had one in progress but
  decided to let it mature up until 6.12"

* tag 'tpmdd-next-6.11-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/jarkko/linux-tpmdd:
  tpm_tis_spi: add missing attpm20p SPI device ID entry
  char: tpm: Fix possible memory leak in tpm_bios_measurements_open()
parents b02c520f 0543f294

drivers/char/tpm/eventlog/common.c

+2 −0
Original line number Diff line number Diff line
@@ -47,6 +47,8 @@ static int tpm_bios_measurements_open(struct inode *inode, 
	if (!err) {

		seq = file->private_data;

		seq->private = chip;

	} else {

		put_device(&chip->dev);

	}



	return err;

drivers/char/tpm/tpm_tis_spi_main.c

+1 −0
Original line number Diff line number Diff line
@@ -318,6 +318,7 @@ static void tpm_tis_spi_remove(struct spi_device *dev) 
}



static const struct spi_device_id tpm_tis_spi_id[] = {

	{ "attpm20p", (unsigned long)tpm_tis_spi_probe },

	{ "st33htpm-spi", (unsigned long)tpm_tis_spi_probe },

	{ "slb9670", (unsigned long)tpm_tis_spi_probe },

	{ "tpm_tis_spi", (unsigned long)tpm_tis_spi_probe },