Chromium Code Reviews| Index: firmware/stub/tpm_lite_stub.c |
| diff --git a/firmware/stub/tpm_lite_stub.c b/firmware/stub/tpm_lite_stub.c |
| index 2695fae35d7136bec9a0d5ee080577588b52e6eb..57ef03ad9c9a0bf25137f719228f55964ff8332d 100644 |
| --- a/firmware/stub/tpm_lite_stub.c |
| +++ b/firmware/stub/tpm_lite_stub.c |
| @@ -99,22 +99,23 @@ POSSIBLY_UNUSED static INLINE int TpmResponseSize(const uint8_t* buffer) { |
| } |
| -void TlclStubInit(void) { |
| - TlclOpenDevice(); |
| +uint32_t TlclStubInit(void) { |
| + return TlclOpenDevice(); |
| } |
| -void TlclCloseDevice(void) { |
| +uint32_t TlclCloseDevice(void) { |
| close(tpm_fd); |
|
Randall Spangler
2010/12/14 18:12:28
if (tpm_fd != -1)
close(tpm_fd);
(don't close i
Che-Liang Chiou
2010/12/15 03:04:37
Done.
|
| tpm_fd = -1; |
| + return 0; |
| } |
| -void TlclOpenDevice(void) { |
| +uint32_t TlclOpenDevice(void) { |
| char* device_path; |
| if (tpm_fd >= 0) |
| - return; /* Already open */ |
| + return 0; /* Already open */ |
| device_path = getenv("TPM_DEVICE_PATH"); |
| if (device_path == NULL) { |
| @@ -124,7 +125,10 @@ void TlclOpenDevice(void) { |
| tpm_fd = open(device_path, O_RDWR); |
| if (tpm_fd < 0) { |
| error("cannot open TPM device %s: %s\n", device_path, strerror(errno)); |
| + return TPM_E_IOERROR; |
| } |
| + |
| + return 0; |
| } |