• Linus Torvalds's avatar
    Revert "tpm_tis: Use timeouts returned from TPM" · e5871372
    Linus Torvalds authored
    This reverts commit 9b29050f.
    
    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: default avatarNorbert Preining <preining@logic.at>
    Reported-and-requested-by: default avatarJiri 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: default avatarRafael J. Wysocki <rjw@sisk.pl>
    Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
    e5871372
tpm.h 7.29 KB