diff -r 75e242a56344 tboot/common/tpm.c
--- a/tboot/common/tpm.c	Tue Jan 05 23:05:07 2010 -0800
+++ b/tboot/common/tpm.c	Fri Jan 29 00:59:05 2010 +0000
@@ -1944,10 +1944,10 @@
          * timeout_x represents the number of milliseconds for the timeout
          * and timeout[x] represents the number of microseconds.
          */
-        g_timeout.timeout_a = timeout[0]/1000;
-        g_timeout.timeout_b = timeout[1]/1000;
-        g_timeout.timeout_c = timeout[2]/1000;
-        g_timeout.timeout_d = timeout[3]/1000;
+        g_timeout.timeout_a = timeout[0];
+        g_timeout.timeout_b = timeout[1];
+        g_timeout.timeout_c = timeout[2];
+        g_timeout.timeout_d = timeout[3];
         printk("TPM timeout values: A: %u, B: %u, C: %u, D: %u\n",
                g_timeout.timeout_a, g_timeout.timeout_b, g_timeout.timeout_c,
                g_timeout.timeout_d);