diff options
| author | Che-Liang Chiou <clchiou@chromium.org> | 2010-12-16 14:11:17 +0800 |
|---|---|---|
| committer | Che-Liang Chiou <clchiou@chromium.org> | 2010-12-16 14:11:17 +0800 |
| commit | 5d9509cbdee7b9c8dd91ed47d967569dbb9af83d (patch) | |
| tree | 8059f69040daa6b8b07415f60c49e36b158f2ae6 /firmware/lib/rollback_index.c | |
| parent | 9880ca5a03b72019c667b4492214830f9d355778 (diff) | |
| download | vboot-5d9509cbdee7b9c8dd91ed47d967569dbb9af83d.tar.gz | |
vboot TPM stub functions return error codes
TlclStubInit, TlclCloseDevice, and TlclOpenDevice were void functions but
should return error codes.
BUG=chromium-os:6695
TEST=RUNTESTS=1 make && emerge successfully
Review URL: http://codereview.chromium.org/5796005
Change-Id: I8ddbf8b1f080d98ff6ed42c4a675fbda5b17eef1
Diffstat (limited to 'firmware/lib/rollback_index.c')
| -rw-r--r-- | firmware/lib/rollback_index.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/firmware/lib/rollback_index.c b/firmware/lib/rollback_index.c index 766b62e2..efbc87be 100644 --- a/firmware/lib/rollback_index.c +++ b/firmware/lib/rollback_index.c @@ -197,8 +197,7 @@ uint32_t SetupTPM(int recovery_mode, int developer_mode, g_rollback_recovery_mode = 1; /* Global variables are usable in * recovery mode */ - /* TODO: TlclLibInit() should be able to return failure */ - TlclLibInit(); + RETURN_ON_FAILURE(TlclLibInit()); RETURN_ON_FAILURE(TlclStartup()); /* Use ContinueSelfTest rather than SelfTestFull(). It enables @@ -336,7 +335,7 @@ uint32_t RollbackKernelLock(void) { uint32_t RollbackS3Resume(void) { uint32_t result; - TlclLibInit(); + RETURN_ON_FAILURE(TlclLibInit()); result = TlclResume(); if (result == TPM_E_INVALID_POSTINIT) { /* We're on a platform where the TPM maintains power in S3, so |