diff options
| author | Jarkko Sakkinen <jarkko.sakkinen@linux.intel.com> | 2016-04-11 13:20:57 +0200 |
|---|---|---|
| committer | Jarkko Sakkinen <jarkko.sakkinen@linux.intel.com> | 2016-06-25 16:26:35 +0200 |
| commit | dcbeab194645486dc482b49b44ef5b8634153034 (patch) | |
| tree | 120fa47c8681277704daaf071584922949df1cad /drivers/char/tpm/tpm_tis.c | |
| parent | tpm: cleanup tpm_tis_remove() (diff) | |
| download | linux-dcbeab194645486dc482b49b44ef5b8634153034.tar.xz linux-dcbeab194645486dc482b49b44ef5b8634153034.zip | |
tpm: fix crash in tpm_tis deinitialization
rmmod crashes the driver because tpm_chip_unregister() already sets ops
to NULL. This commit fixes the issue by moving tpm2_shutdown() to
tpm_chip_unregister(). This commit is also cleanup because it removes
duplicate code from tpm_crb and tpm_tis to the core.
Fixes: 4d3eac5e156a ("tpm: Provide strong locking for device removal")
Signed-off-by: Jarkko Sakkinen <jarkko.sakkinen@linux.intel.com>
Reviewed-by: Jason Gunthorpe <jgunthorpe@obsidianresearch.com>
Diffstat (limited to 'drivers/char/tpm/tpm_tis.c')
| -rw-r--r-- | drivers/char/tpm/tpm_tis.c | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/drivers/char/tpm/tpm_tis.c b/drivers/char/tpm/tpm_tis.c index 18236f66c084..0b0d44f9aaf2 100644 --- a/drivers/char/tpm/tpm_tis.c +++ b/drivers/char/tpm/tpm_tis.c @@ -653,9 +653,6 @@ static void tpm_tis_remove(struct tpm_chip *chip) void __iomem *reg = chip->vendor.iobase + TPM_INT_ENABLE(chip->vendor.locality); - if (chip->flags & TPM_CHIP_FLAG_TPM2) - tpm2_shutdown(chip, TPM2_SU_CLEAR); - iowrite32(~TPM_GLOBAL_INT_ENABLE & ioread32(reg), reg); release_locality(chip, chip->vendor.locality, 1); } |