From fa9192d26e248a9ebe0b4f6c373c6744579ccb85 Mon Sep 17 00:00:00 2001 From: Linus Torvalds Date: Tue, 1 Mar 2011 13:23:27 -0800 Subject: [PATCH] --- yaml --- r: 233753 b: refs/heads/master c: 8d1dc20e8d689c7e6a0a4d2c94e36a99d5793ecb h: refs/heads/master i: 233751: fda8212b56e0ccddfaeb5e360ab8948511d2ef2a v: v3 --- [refs] | 2 +- trunk/drivers/char/tpm/tpm.c | 10 ++++------ 2 files changed, 5 insertions(+), 7 deletions(-) diff --git a/[refs] b/[refs] index 52a3d8c816ae..d918e862bd4e 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 3e1f2356ce231488dc1fa844e5ce91bcb59fc2a1 +refs/heads/master: 8d1dc20e8d689c7e6a0a4d2c94e36a99d5793ecb diff --git a/trunk/drivers/char/tpm/tpm.c b/trunk/drivers/char/tpm/tpm.c index 36e0fa161c2b..1f46f1cd9225 100644 --- a/trunk/drivers/char/tpm/tpm.c +++ b/trunk/drivers/char/tpm/tpm.c @@ -364,14 +364,12 @@ unsigned long tpm_calc_ordinal_duration(struct tpm_chip *chip, tpm_protected_ordinal_duration[ordinal & TPM_PROTECTED_ORDINAL_MASK]; - if (duration_idx != TPM_UNDEFINED) { + if (duration_idx != TPM_UNDEFINED) duration = chip->vendor.duration[duration_idx]; - /* if duration is 0, it's because chip->vendor.duration wasn't */ - /* filled yet, so we set the lowest timeout just to give enough */ - /* time for tpm_get_timeouts() to succeed */ - return (duration <= 0 ? HZ : duration); - } else + if (duration <= 0) return 2 * 60 * HZ; + else + return duration; } EXPORT_SYMBOL_GPL(tpm_calc_ordinal_duration);