diff options
| author | Ard Biesheuvel <ardb@kernel.org> | 2022-12-05 09:32:11 +0100 |
|---|---|---|
| committer | Ard Biesheuvel <ardb@kernel.org> | 2022-12-07 19:08:57 +0100 |
| commit | d9f26ae731259c8fb2d62a742c64e454996944a8 (patch) | |
| tree | 08a1d422cf241d256acb7e61cb60a9e0c4782278 /drivers/char/tpm/tpm-interface.c | |
| parent | efi: Put Linux specific magic number in the DOS header (diff) | |
| parent | Linux 6.1-rc8 (diff) | |
| download | linux-d9f26ae731259c8fb2d62a742c64e454996944a8.tar.xz linux-d9f26ae731259c8fb2d62a742c64e454996944a8.zip | |
Merge tag 'v6.1-rc8' into efi/next
Linux 6.1-rc8
Diffstat (limited to 'drivers/char/tpm/tpm-interface.c')
| -rw-r--r-- | drivers/char/tpm/tpm-interface.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/drivers/char/tpm/tpm-interface.c b/drivers/char/tpm/tpm-interface.c index 1621ce818705..d69905233aff 100644 --- a/drivers/char/tpm/tpm-interface.c +++ b/drivers/char/tpm/tpm-interface.c @@ -401,13 +401,14 @@ int tpm_pm_suspend(struct device *dev) !pm_suspend_via_firmware()) goto suspended; - if (!tpm_chip_start(chip)) { + rc = tpm_try_get_ops(chip); + if (!rc) { if (chip->flags & TPM_CHIP_FLAG_TPM2) tpm2_shutdown(chip, TPM2_SU_STATE); else rc = tpm1_pm_suspend(chip, tpm_suspend_pcr); - tpm_chip_stop(chip); + tpm_put_ops(chip); } suspended: |