diff options
| author | Stefan Berger <stefanb@linux.vnet.ibm.com> | 2012-01-18 04:07:30 +0100 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-01-19 00:50:17 +0100 |
| commit | be405411f712489f2f780ab085e1069e8fb85f19 (patch) | |
| tree | 39816de2c022f940cfeb6bd3218f9346b91f31f7 /include/acpi | |
| parent | nvme: fix merge error due to change of 'make_request_fn' fn type (diff) | |
| download | linux-be405411f712489f2f780ab085e1069e8fb85f19.tar.xz linux-be405411f712489f2f780ab085e1069e8fb85f19.zip | |
tpm: fix (ACPI S3) suspend regression
This patch fixes an (ACPI S3) suspend regression introduced in commit
68d6e6713fcb ("tpm: Introduce function to poll for result of self test")
and occurring with an Infineon TPM and tpm_tis and tpm_infineon drivers
active.
The suspend problem occurred if the TPM was disabled and/or deactivated
and therefore the TPM_PCRRead checking the result of the (asynchronous)
self test returned an error code which then caused the tpm_tis driver to
become inactive and this then seemed to have negatively influenced the
suspend support by the tpm_infineon driver... Besides that the tpm_tis
drive may stay active even if the TPM is disabled and/or deactivated.
Signed-off-by: Stefan Berger <stefanb@linux.vnet.ibm.com>
Tested-by: Rafael J. Wysocki <rjw@sisk.pl>
Acked-by: Rajiv Andrade <srajiv@linux.vnet.ibm.com>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'include/acpi')
0 files changed, 0 insertions, 0 deletions