aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorapronin@chromium.org <apronin@chromium.org>2016-07-14 20:29:40 -0400
committerJarkko Sakkinen <jarkko.sakkinen@linux.intel.com>2016-07-19 10:43:38 -0400
commit79b591c091b31291fecd9551db0a67fdc5901d50 (patch)
tree5de2deb420cebd98f522f19d945ff1953ac02d07
parentd4d03f74a73f3b8b2801d4d02011b6b69778cbcc (diff)
tpm_tis_core: convert max timeouts from msec to jiffies
tpm_tis_core was missing conversion from msec when assigning max timeouts from constants. Fixes: aec04cbdf723 ("tpm: TPM 2.0 FIFO Interface") Signed-off-by: Andrey Pronin <apronin@chromium.org> Reviewed-by: Jason Gunthorpe <jgunthorpe@obsidianresearch.com> Reviewed-by: Jarkko Sakkinen <jarkko.sakkinen@linux.intel.com> Signed-off-by: Jarkko Sakkinen <jarkko.sakkinen@linux.intel.com>
-rw-r--r--drivers/char/tpm/tpm_tis_core.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/char/tpm/tpm_tis_core.c b/drivers/char/tpm/tpm_tis_core.c
index 03a06b33450a..ace95b39566f 100644
--- a/drivers/char/tpm/tpm_tis_core.c
+++ b/drivers/char/tpm/tpm_tis_core.c
@@ -671,10 +671,10 @@ int tpm_tis_core_init(struct device *dev, struct tpm_tis_data *priv, int irq,
671#endif 671#endif
672 672
673 /* Maximum timeouts */ 673 /* Maximum timeouts */
674 chip->timeout_a = TIS_TIMEOUT_A_MAX; 674 chip->timeout_a = msecs_to_jiffies(TIS_TIMEOUT_A_MAX);
675 chip->timeout_b = TIS_TIMEOUT_B_MAX; 675 chip->timeout_b = msecs_to_jiffies(TIS_TIMEOUT_B_MAX);
676 chip->timeout_c = TIS_TIMEOUT_C_MAX; 676 chip->timeout_c = msecs_to_jiffies(TIS_TIMEOUT_C_MAX);
677 chip->timeout_d = TIS_TIMEOUT_D_MAX; 677 chip->timeout_d = msecs_to_jiffies(TIS_TIMEOUT_D_MAX);
678 priv->phy_ops = phy_ops; 678 priv->phy_ops = phy_ops;
679 dev_set_drvdata(&chip->dev, priv); 679 dev_set_drvdata(&chip->dev, priv);
680 680