Revert: tpm_tis: Use timeouts returned from TPM
commit27e7cd1457ce8320739b73db543f46000a640803
authorGreg Kroah-Hartman <gregkh@suse.de>
Tue, 22 Feb 2011 20:12:27 +0000 (22 12:12 -0800)
committerGreg Kroah-Hartman <gregkh@suse.de>
Thu, 24 Feb 2011 22:54:42 +0000 (24 14:54 -0800)
tree4c367861219eb8339a15a7cd9ecf24f39bc220c6
parent9f0cf44ce4d2dc472c2303d87af7be6765ac93c7
Revert: tpm_tis: Use timeouts returned from TPM

This is a revert of commit 9b29050f8f75916f974a2d231ae5d3cd59792296
upstream which has been found to prevent suspend from working on a
number of systems.

Thanks to Jiri Slaby <jirislaby@gmail.com> for tracing this down.

Cc: Jiri Slaby <jirislaby@gmail.com>
Cc: Rafael Wysocki <rjw@sisk.pl>
Cc: Stefan Berger <stefanb@linux.vnet.ibm.com>
Cc: Guillaume Chazarain <guichaz@gmail.com>
Cc: Rajiv Andrade <srajiv@linux.vnet.ibm.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
drivers/char/tpm/tpm.c
drivers/char/tpm/tpm.h
drivers/char/tpm/tpm_tis.c