From dfd3ef54c671c591b1201a44971a2ae8d025a396 Mon Sep 17 00:00:00 2001
From: Stefan Berger <stefanb@linux.vnet.ibm.com>
Date: Fri, 11 Nov 2011 12:57:06 -0500
Subject: [PATCH] --- yaml --- r: 283234 b: refs/heads/master c:
 a927b8131794ee449b7f6666e7ab61301949b20f h: refs/heads/master v: v3

---
 [refs]                           | 2 +-
 trunk/drivers/char/tpm/tpm_tis.c | 3 +++
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 0dabf60c91ca..b8c1222eaa94 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 7f326ed7ff221a109bf89288bf6c8f0142e3e75c
+refs/heads/master: a927b8131794ee449b7f6666e7ab61301949b20f
diff --git a/trunk/drivers/char/tpm/tpm_tis.c b/trunk/drivers/char/tpm/tpm_tis.c
index 34832bc74649..d93bafde3120 100644
--- a/trunk/drivers/char/tpm/tpm_tis.c
+++ b/trunk/drivers/char/tpm/tpm_tis.c
@@ -432,6 +432,9 @@ static int probe_itpm(struct tpm_chip *chip)
 out:
 	itpm = rem_itpm;
 	tpm_tis_ready(chip);
+	/* some TPMs need a break here otherwise they will not work
+	 * correctly on the immediately subsequent command */
+	msleep(chip->vendor.timeout_b);
 	release_locality(chip, chip->vendor.locality, 0);
 
 	return rc;