diff mbox

2.6.37.1 s2disk regression (TPM)

Message ID 4D629427.8020500@gmail.com (mailing list archive)
State Not Applicable, archived
Headers show

Commit Message

Jiri Slaby Feb. 21, 2011, 4:34 p.m. UTC 
None
diff mbox

Patch

--- a/drivers/char/tpm/tpm_tis.c
+++ b/drivers/char/tpm/tpm_tis.c
@@ -201,7 +201,7 @@  static int wait_for_stat(struct tpm_chip *chip, u8
mask, unsigned long timeout,
                                                      ((tpm_tis_status
                                                        (chip) & mask) ==
                                                       mask), timeout);
-               if (rc > 0)
+               if (rc > 0 || (tpm_tis_status(chip) & mask) == mask)
                        return 0;
        } else {