diff options
| author | Jarkko Sakkinen <jarkko.sakkinen@linux.intel.com> | 2016-02-18 22:11:29 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2016-04-12 09:08:47 -0700 |
| commit | 160f50a3f40f3aa32ec7c7c9d18b3ffb5bdf12e2 (patch) | |
| tree | 483b2caa609b3570cbaba8c71d4275833fa004b8 /drivers/char | |
| parent | 3e69549b48e39e72c7aad093e0c5e29ab547a9f1 (diff) | |
tpm_crb: tpm2_shutdown() must be called before tpm_chip_unregister()
commit 99cda8cb4639de81cde785b5bab9bc52e916e594 upstream.
Wrong call order.
Reported-by: Jason Gunthorpe <jgunthorpe@obsidianresearch.com>
Fixes: 74d6b3ceaa17
Signed-off-by: Jarkko Sakkinen <jarkko.sakkinen@linux.intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
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 4bb9727c1047..61e64293b765 100644 --- a/drivers/char/tpm/tpm_crb.c +++ b/drivers/char/tpm/tpm_crb.c @@ -310,11 +310,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; } |