diff options
| author | Randall Spangler <rspangler@chromium.org> | 2010-11-23 14:17:21 -0800 |
|---|---|---|
| committer | Randall Spangler <rspangler@chromium.org> | 2010-11-23 14:17:21 -0800 |
| commit | 44f34b51951eaf90be5d5d87f43c459b8b4e3094 (patch) | |
| tree | ff230a38c87edb450991475841fecf63d1e66e85 /firmware/lib/rollback_index.c | |
| parent | 500b3c2369e1a8370041ea276bc40b81c6e7a713 (diff) | |
| download | vboot-44f34b51951eaf90be5d5d87f43c459b8b4e3094.tar.gz | |
Port over ContinueSelfTest() fix from firmware
Change-Id: Ib12405f968af11ad75a6429ae9ebe502dde5bf92
BUG=chrome-os-partner:1591
TEST=make && make runtests
(This is already in the firmware; I'm just copying it back into vboot reference)
Review URL: http://codereview.chromium.org/5312003
Diffstat (limited to 'firmware/lib/rollback_index.c')
| -rw-r--r-- | firmware/lib/rollback_index.c | 11 |
1 files changed, 2 insertions, 9 deletions
diff --git a/firmware/lib/rollback_index.c b/firmware/lib/rollback_index.c index ba6e21c0..766b62e2 100644 --- a/firmware/lib/rollback_index.c +++ b/firmware/lib/rollback_index.c @@ -283,7 +283,6 @@ uint32_t RollbackS3Resume(void) { * environment, don't even talk to the TPM. */ TlclLibInit(); TlclResume(); - TlclContinueSelfTest(); #endif return TPM_SUCCESS; } @@ -341,16 +340,10 @@ uint32_t RollbackS3Resume(void) { result = TlclResume(); if (result == TPM_E_INVALID_POSTINIT) { /* We're on a platform where the TPM maintains power in S3, so - it's already initialized. No need for a self-test. */ + it's already initialized. */ return TPM_SUCCESS; } - if (result != TPM_SUCCESS) { - return result; - } - - RETURN_ON_FAILURE(TlclContinueSelfTest()); - - return TPM_SUCCESS; + return result; } |