1 files changed, 7 insertions, 7 deletions

diff --git a/drivers/char/tpm/tpm.c b/drivers/char/tpm/tpm.c
index 1fee7034a386..6b5a0e0127a7 100644
--- a/drivers/char/tpm/tpm.c
+++ b/drivers/char/tpm/tpm.c
@@ -525,19 +525,19 @@ void tpm_get_timeouts(struct tpm_chip *chip)
         timeout =
             be32_to_cpu(*((__be32 *) (data + TPM_GET_CAP_RET_UINT32_1_IDX)));
         if (timeout)
-                chip->vendor.timeout_a = msecs_to_jiffies(timeout);
+                chip->vendor.timeout_a = usecs_to_jiffies(timeout);
         timeout =
             be32_to_cpu(*((__be32 *) (data + TPM_GET_CAP_RET_UINT32_2_IDX)));
         if (timeout)
-                chip->vendor.timeout_b = msecs_to_jiffies(timeout);
+                chip->vendor.timeout_b = usecs_to_jiffies(timeout);
         timeout =
             be32_to_cpu(*((__be32 *) (data + TPM_GET_CAP_RET_UINT32_3_IDX)));
         if (timeout)
-                chip->vendor.timeout_c = msecs_to_jiffies(timeout);
+                chip->vendor.timeout_c = usecs_to_jiffies(timeout);
         timeout =
             be32_to_cpu(*((__be32 *) (data + TPM_GET_CAP_RET_UINT32_4_IDX)));
         if (timeout)
-                chip->vendor.timeout_d = msecs_to_jiffies(timeout);
+                chip->vendor.timeout_d = usecs_to_jiffies(timeout);
 
 duration:
         memcpy(data, tpm_cap, sizeof(tpm_cap));
@@ -554,15 +554,15 @@ duration:
                 return;
 
         chip->vendor.duration[TPM_SHORT] =
-            msecs_to_jiffies(be32_to_cpu
+            usecs_to_jiffies(be32_to_cpu
                              (*((__be32 *) (data +
                                             TPM_GET_CAP_RET_UINT32_1_IDX))));
         chip->vendor.duration[TPM_MEDIUM] =
-            msecs_to_jiffies(be32_to_cpu
+            usecs_to_jiffies(be32_to_cpu
                              (*((__be32 *) (data +
                                             TPM_GET_CAP_RET_UINT32_2_IDX))));
         chip->vendor.duration[TPM_LONG] =
-            msecs_to_jiffies(be32_to_cpu
+            usecs_to_jiffies(be32_to_cpu
                              (*((__be32 *) (data +
                                             TPM_GET_CAP_RET_UINT32_3_IDX))));
 }