From 33bc5be76ec5cef0cf9e8b840fb6b7849c755cc5 Mon Sep 17 00:00:00 2001 From: Stefan Berger Date: Tue, 23 Aug 2011 08:52:10 -0400 Subject: [PATCH] --- yaml --- r: 264513 b: refs/heads/master c: 403d1d0319ad73b5ccf251745af4c7000331a76b h: refs/heads/master i: 264511: 05e3124e5cd2ab83048e3e8899143cdfb4d9d58a v: v3 --- [refs] | 2 +- trunk/drivers/char/tpm/tpm.c | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index 773889b93494..fa35d70887bb 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 8ad346c62ae91e6376fb9d199ef8557b0c814209 +refs/heads/master: 403d1d0319ad73b5ccf251745af4c7000331a76b diff --git a/trunk/drivers/char/tpm/tpm.c b/trunk/drivers/char/tpm/tpm.c index caf8012ef47c..e53af7638186 100644 --- a/trunk/drivers/char/tpm/tpm.c +++ b/trunk/drivers/char/tpm/tpm.c @@ -963,6 +963,9 @@ ssize_t tpm_show_durations(struct device *dev, struct device_attribute *attr, { struct tpm_chip *chip = dev_get_drvdata(dev); + if (chip->vendor.duration[TPM_LONG] == 0) + return 0; + return sprintf(buf, "%d %d %d [%s]\n", jiffies_to_usecs(chip->vendor.duration[TPM_SHORT]), jiffies_to_usecs(chip->vendor.duration[TPM_MEDIUM]),