Revert "TPM: Long default timeout fix"
authorLinus Torvalds <torvalds@linux-foundation.org>
Tue, 1 Mar 2011 21:23:27 +0000 (13:23 -0800)
committerAndi Kleen <ak@linux.intel.com>
Thu, 28 Apr 2011 15:21:16 +0000 (08:21 -0700)
commita37486058b79610f79fabe9dba4156de0493f24c
tree28593ec63764ed23690613feb625cea932a15def
parent9128ce02d90d51012f561526d8c052f85a0d725b
Revert "TPM: Long default timeout fix"

[ upstream commit 8d1dc20e8d689c7e6a0a4d2c94e36a99d5793ecb ]

This reverts commit c4ff4b829ef9e6353c0b133b7adb564a68054979.

Ted Ts'o reports:

 "TPM is working for me so I can log into employer's network in 2.6.37.
  It broke when I tried 2.6.38-rc6, with the following relevant lines
  from my dmesg:

  [   11.081627] tpm_tis 00:0b: 1.2 TPM (device-id 0x0, rev-id 78)
  [   25.734114] tpm_tis 00:0b: Operation Timed out
  [   78.040949] tpm_tis 00:0b: Operation Timed out

  This caused me to get suspicious, especially since the _other_ TPM
  commit in 2.6.38 had already been reverted, so I tried reverting
  commit c4ff4b829e: "TPM: Long default timeout fix".  With this commit
  reverted, my TPM on my Lenovo T410 is once again working."

Requested-and-tested-by: Theodore Ts'o <tytso@mit.edu>
Acked-by: Rajiv Andrade <srajiv@linux.vnet.ibm.com>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Signed-off-by: Andi Kleen <ak@linux.intel.com>
drivers/char/tpm/tpm.c