From: Stefan Berger Date: Tue, 23 Aug 2011 12:52:10 +0000 (-0400) Subject: tpm: suppress durations sysfs output if not read X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=403d1d0319ad73b5ccf251745af4c7000331a76b;p=GitHub%2Fexynos8895%2Fandroid_kernel_samsung_universal8895.git tpm: suppress durations sysfs output if not read Suppress the output in the 'durations' sysfs entry if they were not read during driver initialization. This is similar to other sysfs entries that return nothing if for some reason sending the commands to the TPM fails. Signed-off-by: Stefan Berger Signed-off-by: James Morris --- diff --git a/drivers/char/tpm/tpm.c b/drivers/char/tpm/tpm.c index caf8012ef47c..e53af7638186 100644 --- a/drivers/char/tpm/tpm.c +++ b/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]),