---

yaml --- r: 283234 b: refs/heads/master c: a927b81 h: refs/heads/master v: v3
git-mirror · Nov 16, 2011 · dfd3ef5 · dfd3ef5
1 parent a08158e
commit dfd3ef5
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
diff --git 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
@@ -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;