diff options
| author | Jerry Snitselaar <jsnitsel@redhat.com> | 2019-01-30 23:06:58 +0100 |
|---|---|---|
| committer | Jarkko Sakkinen <jarkko.sakkinen@linux.intel.com> | 2019-02-13 08:47:01 +0100 |
| commit | 36ce089758b1b55df5854d6b6d74713f609e125d (patch) | |
| tree | 45bd1df16ab47554076866dab97b88bf22a1ddca /drivers/char/tpm/tpm1-cmd.c | |
| parent | tpm: don't print error message in tpm_transmit_cmd when tpm still testing (diff) | |
| download | linux-36ce089758b1b55df5854d6b6d74713f609e125d.tar.xz linux-36ce089758b1b55df5854d6b6d74713f609e125d.zip | |
tpm: don't return bool from update_timeouts
Set tpm_chip->timeouts_adjusted directly in the update_timeouts
code instead of returning bool. In case of tpm read failing
print warning that the read failed and continue on.
Signed-off-by: Jerry Snitselaar <jsnitsel@redhat.com>
Reviewed-by: Jarkko Sakkinen <jarkko.sakkinen@linux.intel.com>
Signed-off-by: Jarkko Sakkinen <jarkko.sakkinen@linux.intel.com>
Diffstat (limited to 'drivers/char/tpm/tpm1-cmd.c')
| -rw-r--r-- | drivers/char/tpm/tpm1-cmd.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/char/tpm/tpm1-cmd.c b/drivers/char/tpm/tpm1-cmd.c index 6f306338953b..bda9a16b44f6 100644 --- a/drivers/char/tpm/tpm1-cmd.c +++ b/drivers/char/tpm/tpm1-cmd.c @@ -380,8 +380,7 @@ int tpm1_get_timeouts(struct tpm_chip *chip) * of misreporting. */ if (chip->ops->update_timeouts) - chip->timeout_adjusted = - chip->ops->update_timeouts(chip, timeout_eff); + chip->ops->update_timeouts(chip, timeout_eff); if (!chip->timeout_adjusted) { /* Restore default if chip reported 0 */ |