diff options
| author | Jarkko Sakkinen <jarkko.sakkinen@linux.intel.com> | 2016-02-18 22:11:29 +0200 |
|---|---|---|
| committer | Sasha Levin <sasha.levin@oracle.com> | 2016-04-18 08:50:37 -0400 |
| commit | 3a4db9eef86e230e3b441ea14ab4ed5492b5bf02 (patch) | |
| tree | 852d67db5fc8e55e23be9d0702cd6dc21e0d59c1 /drivers/char | |
| parent | 2ecb9996d53c218a536ad796b766c2c1cd06c3c0 (diff) | |
tpm_crb: tpm2_shutdown() must be called before tpm_chip_unregister()
[ Upstream commit 99cda8cb4639de81cde785b5bab9bc52e916e594 ]
Wrong call order.
Reported-by: Jason Gunthorpe <jgunthorpe@obsidianresearch.com>
Fixes: 74d6b3ceaa17
Signed-off-by: Jarkko Sakkinen <jarkko.sakkinen@linux.intel.com>
cc: stable@vger.kernel.org
Signed-off-by: Sasha Levin <sasha.levin@oracle.com>
Diffstat (limited to 'drivers/char')
| -rw-r--r-- | drivers/char/tpm/tpm_crb.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/char/tpm/tpm_crb.c b/drivers/char/tpm/tpm_crb.c index 2b971b3e5c1c..b02d4b160403 100644 --- a/drivers/char/tpm/tpm_crb.c +++ b/drivers/char/tpm/tpm_crb.c @@ -309,11 +309,11 @@ static int crb_acpi_remove(struct acpi_device *device) struct device *dev = &device->dev; struct tpm_chip *chip = dev_get_drvdata(dev); - tpm_chip_unregister(chip); - if (chip->flags & TPM_CHIP_FLAG_TPM2) tpm2_shutdown(chip, TPM2_SU_CLEAR); + tpm_chip_unregister(chip); + return 0; } |