From 13184a57c9e4b0f41e5900a2f4e883f32b00e412 Mon Sep 17 00:00:00 2001
From: Kylene Jo Hall <kjhall@us.ibm.com>
Date: Thu, 23 Jun 2005 22:02:10 -0700
Subject: [PATCH] --- yaml --- r: 3071 b: refs/heads/master c:
 34d6e07570ef74b965131452a862b13dfa779188 h: refs/heads/master i:   3069:
 005f5bb902ba8f4c4f59f80792a617b6c15cc275   3067:
 a8f7456c017f94d726bddb48ab140214d9326b0a   3063:
 32a5330d742e29306bc140131daa9fdf40ff555f   3055:
 43204a27e14909cd027cf3dcf47c30301e3ee97b   3039:
 04908999603bffc6848194effe8e09375ac1c0e9   3007:
 4a31e59d88a3667fe1839fa36b440c8310905c35   2943:
 08c14786d1ae166367c698e94f22ee9cd5da4a4b   2815:
 17249d34c5ac6cfd4db8e93358382ae22ec91cab   2559:
 6ce3c72ae977dc13ca21318b58b0339b167e8028   2047:
 e10090489848902abd81125507a5aaf6599a5e82 v: v3

---
 [refs]                       |  2 +-
 trunk/drivers/char/tpm/tpm.c | 10 ++++++----
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/[refs] b/[refs]
index c60f5af20e49..06f93b159bd7 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: e234bc970451edc4021637fe2979b887da873f9a
+refs/heads/master: 34d6e07570ef74b965131452a862b13dfa779188
diff --git a/trunk/drivers/char/tpm/tpm.c b/trunk/drivers/char/tpm/tpm.c
index 785dce67942f..5c843c9bf819 100644
--- a/trunk/drivers/char/tpm/tpm.c
+++ b/trunk/drivers/char/tpm/tpm.c
@@ -147,7 +147,7 @@ ssize_t tpm_show_pcrs(struct device *dev, struct device_attribute *attr,
 	memcpy(data, cap_pcr, sizeof(cap_pcr));
 	if ((len = tpm_transmit(chip, data, sizeof(data)))
 	    < CAP_PCR_RESULT_SIZE) {
-		dev_err(&chip->pci_dev->dev, "A TPM error (%d) occurred "
+		dev_dbg(&chip->pci_dev->dev, "A TPM error (%d) occurred "
 				"attempting to determine the number of PCRS\n",
 			be32_to_cpu(*((__be32 *) (data + 6))));
 		return 0;
@@ -161,7 +161,7 @@ ssize_t tpm_show_pcrs(struct device *dev, struct device_attribute *attr,
 		memcpy(data + 10, &index, 4);
 		if ((len = tpm_transmit(chip, data, sizeof(data)))
 		    < READ_PCR_RESULT_SIZE){
-			dev_err(&chip->pci_dev->dev, "A TPM error (%d) occurred"
+			dev_dbg(&chip->pci_dev->dev, "A TPM error (%d) occurred"
 				" attempting to read PCR %d of %d\n",
 				be32_to_cpu(*((__be32 *) (data + 6))), i, num_pcrs);
 			goto out;
@@ -205,10 +205,11 @@ ssize_t tpm_show_pubek(struct device *dev, struct device_attribute *attr,
 
 	if ((len = tpm_transmit(chip, data, READ_PUBEK_RESULT_SIZE)) <
 	    READ_PUBEK_RESULT_SIZE) {
-		dev_err(&chip->pci_dev->dev, "A TPM error (%d) occurred "
+		dev_dbg(&chip->pci_dev->dev, "A TPM error (%d) occurred "
 				"attempting to read the PUBEK\n",
 			    be32_to_cpu(*((__be32 *) (data + 6))));
-		return 0;
+		rc = 0;
+		goto out;
 	}
 
 	/* 
@@ -240,6 +241,7 @@ ssize_t tpm_show_pubek(struct device *dev, struct device_attribute *attr,
 			str += sprintf(str, "\n");
 	}
 	rc = str - buf;
+out:
 	kfree(data);
 	return rc;
 }