]> git.baikalelectronics.ru Git - kernel.git/commit
Revert "tpm_tis: Use timeouts returned from TPM"
authorLinus Torvalds <torvalds@linux-foundation.org>
Sun, 20 Feb 2011 18:03:12 +0000 (10:03 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Sun, 20 Feb 2011 18:03:12 +0000 (10:03 -0800)
commitcb9efd616484f636ba92e2fe8fb38c3cfc705c0a
treef22d77710dd461242e084ffbbfcf2fd4600cbd7b
parent88e79af47ab643f7a1db54c472246e9fa0484f96
Revert "tpm_tis: Use timeouts returned from TPM"

This reverts commit bd6361ab1a5f67b527645d7b13c2efa07fef580a.

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>
drivers/char/tpm/tpm.c
drivers/char/tpm/tpm.h
drivers/char/tpm/tpm_tis.c