aboutsummaryrefslogtreecommitdiffstats
path: root/sound/isa
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2011-02-20 10:03:12 -0800
committerLinus Torvalds <torvalds@linux-foundation.org>2011-02-20 10:03:12 -0800
commite58713724059da7d2982d6ad945192c8fca5b729 (patch)
treef22d77710dd461242e084ffbbfcf2fd4600cbd7b /sound/isa
parentb4c9bfab2ec7389d42fdc39093959f533e7b4281 (diff)
downloadkernel_samsung_crespo-e58713724059da7d2982d6ad945192c8fca5b729.zip
kernel_samsung_crespo-e58713724059da7d2982d6ad945192c8fca5b729.tar.gz
kernel_samsung_crespo-e58713724059da7d2982d6ad945192c8fca5b729.tar.bz2
Revert "tpm_tis: Use timeouts returned from TPM"
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>
Diffstat (limited to 'sound/isa')
0 files changed, 0 insertions, 0 deletions