From: Stefan Berger Date: Wed, 18 Jan 2012 03:07:30 +0000 (-0500) Subject: tpm: fix (ACPI S3) suspend regression X-Git-Tag: v3.3-rc1~9 X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=be405411f712489f2f780ab085e1069e8fb85f19;p=pandora-kernel.git 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 Tested-by: Rafael J. Wysocki Acked-by: Rajiv Andrade Signed-off-by: Linus Torvalds --- Reading git-diff-tree failed