diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-02-20 10:03:12 -0800 |
|---|---|---|
| committer | Andi Kleen <ak@linux.intel.com> | 2011-04-28 08:21:16 -0700 |
| commit | f60b63aaa8f2054b5c8bac192ba99e3a99f2d72f (patch) | |
| tree | f5b71d1a12f37382684dcc68388394b2e447f73e /net/decnet | |
| parent | a37486058b79610f79fabe9dba4156de0493f24c (diff) | |
Revert "tpm_tis: Use timeouts returned from TPM"
[ upstream commit e58713724059da7d2982d6ad945192c8fca5b729 ]
This reverts commit 9b29050f8f75916f974a2d231ae5d3cd59792296.
It has caused hibernate regressions, for example Juri Sladby's report:
"I'm unable to hibernate 2.6.37.1 unless I rmmod tpm_tis:
[10974.074587] Suspending console(s) (use no_console_suspend to debug)
[10974.103073] tpm_tis 00:0c: Operation Timed out
[10974.103089] legacy_suspend(): pnp_bus_suspend+0x0/0xa0 returns -62
[10974.103095] PM: Device 00:0c failed to freeze: error -62"
and Rafael points out that some of the new conditionals in that commit
seem to make no sense. This commit needs more work and testing, let's
revert it for now.
Reported-by: Norbert Preining <preining@logic.at>
Reported-and-requested-by: Jiri Slaby <jirislaby@gmail.com>
Cc: Stefan Berger <stefanb@linux.vnet.ibm.com>
Cc: Guillaume Chazarain <guichaz@gmail.com>
Cc: Rajiv Andrade <srajiv@linux.vnet.ibm.com>
Acked-by: Rafael J. Wysocki <rjw@sisk.pl>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Signed-off-by: Andi Kleen <ak@linux.intel.com>
Diffstat (limited to 'net/decnet')
0 files changed, 0 insertions, 0 deletions