diff options
Diffstat (limited to 'utility/mount-encrypted.c')
-rw-r--r-- | utility/mount-encrypted.c | 23 |
1 files changed, 2 insertions, 21 deletions
diff --git a/utility/mount-encrypted.c b/utility/mount-encrypted.c index 39777e9d..d453b6b0 100644 --- a/utility/mount-encrypted.c +++ b/utility/mount-encrypted.c @@ -115,33 +115,14 @@ static int tpm_init_called = 0; static void tpm_init(void) { uint32_t result; - struct timespec delay; - int retries; if (tpm_init_called) return; DEBUG("Opening TPM"); - setenv("TPM_NO_EXIT", "1", 1); - - /* Retry TPM opening for 5 seconds (500 10ms sleeps). */ - for (retries = 0; retries < 500; ++ retries) { - errno = 0; - result = TlclLibInit(); - if (result == TPM_SUCCESS) - break; - INFO("Could not open TPM: error 0x%02x (%s).", result, - strerror(errno)); - /* Assume ENOENT will never recover */ - if (errno == ENOENT) - break; - - /* Stall 10ms until TPM comes back. */ - delay.tv_sec = 0; - delay.tv_nsec = 10000000; - nanosleep(&delay, NULL); - } + setenv("TPM_NO_EXIT", "1", 1); + result = TlclLibInit(); tpm_init_called = 1; has_tpm = (result == TPM_SUCCESS); |