diff options
| author | Tom Rini <[email protected]> | 2021-11-30 08:03:21 -0500 |
|---|---|---|
| committer | Tom Rini <[email protected]> | 2021-11-30 08:03:21 -0500 |
| commit | ce29c52891d2265f854119c9cc6defcc70b54c07 (patch) | |
| tree | a6d0c08733eb50431342d440152754baf19fba2e /drivers | |
| parent | ade37460a944aed36ae6ee634c4d4a9a22690461 (diff) | |
| parent | c0d9bb0b4a747a7ec481b2369391ca8f53e50bc9 (diff) | |
Merge tag 'efi-2022-01-rc4' of https://source.denx.de/u-boot/custodians/u-boot-efi
Pull request for efi-2022-01-rc4
Documentation:
* describe how to enable Virtio RNG on QEMU ARM
UEFI:
* enable testing the TCG2 protocol
* support TPM event log passed from firmware
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/tpm/tpm2_tis_mmio.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/drivers/tpm/tpm2_tis_mmio.c b/drivers/tpm/tpm2_tis_mmio.c index 9cedff22250..f04aab2e6e0 100644 --- a/drivers/tpm/tpm2_tis_mmio.c +++ b/drivers/tpm/tpm2_tis_mmio.c @@ -118,10 +118,13 @@ iounmap: static int tpm_tis_remove(struct udevice *dev) { struct tpm_tis_chip_data *drv_data = (void *)dev_get_driver_data(dev); + int ret; + + ret = tpm_tis_cleanup(dev); iounmap(drv_data->iobase); - return tpm_tis_cleanup(dev); + return ret; } static const struct tpm_ops tpm_tis_ops = { |